[automerger skipped] Merge "Dim correctly in screenshots on some devices" into...

[automerger skipped] Merge "Dim correctly in screenshots on some devices" into udc-qpr-dev am: 65e13d97 am: a8447734 -s ours

am skip reason: Merged-In I3110de534d6ef1ad16f9f94d30874bca6f8838c9 with SHA-1 9af38ba9 is already in history

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



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