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: I24e73f6d21179922490bd797d7ef8c9ccf26883b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>