Fix brightness change during screenrotation am: 4546de0814 am: 309f714afe

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

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