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

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

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