Merge "Dim correctly in screenshots on some devices" into udc-qpr-dev am: 65e13d97

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



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