Merge "Don't update brightness settings when throttling brightness" into...

Merge "Don't update brightness settings when throttling brightness" into tm-dev am: c37d317e am: 40622ad7 am: efe1354b

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



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