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

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

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



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