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

Merge "Disable HDR screenshots" into udc-dev am: 12baa2e6 am: 50d0484c am: 6f337643 am: ee6eee6f

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



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