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

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



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