[automerger skipped] Merge "Support default hbm metadata for non-internal...

[automerger skipped] Merge "Support default hbm metadata for non-internal displays" into tm-qpr-dev am: 214b9462 am: 397477a9 -s ours

am skip reason: Merged-In Idf45b87782a56bcbc09fc37c69fcc13531edf76f with SHA-1 d3bc4913 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21027240



Change-Id: Ibc57347d49e8752a582acf8e13063e4f8d3654e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>