Merge "Fix brightness transition from temporary to automatic brightness" into...

Merge "Fix brightness transition from temporary to automatic brightness" into udc-dev am: 749861bc

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



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