[automerger skipped] Merge "Do not brighten when dim state or low power mode."...

[automerger skipped] Merge "Do not brighten when dim state or low power mode." am: f7a5b2d8 am: b1d6b307 am: 0e3df7be am: 1fdf3817 am: e402726c -s ours

am skip reason: Merged-In I49e3adda3cfd4b793f0eeb3b1da544c581d8c8ec with SHA-1 b13b9ad6 is already in history

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



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