Merge "Adjust screenshot behavior of HDR content" into udc-dev am: c83558cf2d

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

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