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

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

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



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