Merge "Fix HDR blownout issue in the Photos app with HDR display on." into...

Merge "Fix HDR blownout issue in the Photos app with HDR display on." into udc-dev am: 059a0275 am: 8a7154ee am: 37b0dab9

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



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