Merge "Support default hbm metadata for non-internal displays" into tm-qpr-dev am: 214b9462

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



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