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: 6ae1d325

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



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