Merge "Adjust screenshot behavior of HDR content" into udc-dev am: c83558cf am: 32d8237b

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



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