Merge "Adjust screenshot behavior of HDR content" into udc-dev am: c83558cf2d am: d996898565 am: 84189906e1 am: 37f43dd3ee

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

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