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

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



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