Merge "Do not brighten when dim state or low power mode." am: f7a5b2d8 am: b1d6b307

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



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