Merge "Fix brightness change during screenrotation am: 4546de08 am:...

Merge "Fix brightness change during screenrotation am: 4546de08 am: 309f714a" into udc-qpr-dev-plus-aosp am: f9f54892

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



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