Merge "Disable HDR screenshots" into udc-dev am: 12baa2e6 am: c9e11954

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



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