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

Merge "Disable HDR screenshots" into udc-dev am: 12baa2e6 am: 50d0484c am: e124db6a am: c13d072e

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



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