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: de3db15e am: 4cac1d67

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



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