[automerger skipped] Merge "Hdr format settings [Backend]" into sc-dev am:...

[automerger skipped] Merge "Hdr format settings [Backend]" into sc-dev am: 2b5b144e am: 98367eb6 -s ours

am skip reason: Merged-In I58a7714f03a3e165bbd22f2fa7a021ad90b41b39 with SHA-1 7010f95c is already in history

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

Change-Id: I91672cc5b5c3d3971c8919237eb7983de865c7ff