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

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

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