[automerger skipped] Merge "Enable AutoBrightness per display" into tm-qpr-dev...

[automerger skipped] Merge "Enable AutoBrightness per display" into tm-qpr-dev am: 0a73b2fa am: 54b6315f -s ours

am skip reason: Merged-In I7e0b8442c0724da8f9a9b0c6b455f558a42f40c9 with SHA-1 58416fa0 is already in history

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



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