[automerger skipped] Merge changes from topic "cherrypick-Display settings HDR...

[automerger skipped] Merge changes from topic "cherrypick-Display settings HDR formats-mumvl547ah" into sc-dev am: e713ee6c am: 6657c0a7 -s ours

am skip reason: Merged-In I0a99675bf316c1e8ccd3408ec3239dd04159916c with SHA-1 72de55e1 is already in history

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

Change-Id: I3dba5d46cf50f12c532da79bc0d353a23773763d