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

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



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