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: f75ff64d

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



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