Merge "Adjust screenshot behavior of HDR content" into udc-dev am: c83558cf am: 658a5da7

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



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