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: 80fb9579

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



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