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

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

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