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

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



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