Fix brightness change during screenrotation am: 4546de0814 am: 587dfb191e am: abd3cb108f

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

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