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

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

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