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: Ifd06ae2a66142d83c0610b3918f52c0a8bbbba0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>