Merge "Adjust screenshot behavior of HDR content" into udc-dev am: c83558cf2d am: f58c2e78c3 am: 02deea6048 am: 0c9e36d104

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

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