Merge "Merge "Make brightness transition to ON immediate if the screen was OFF...

Merge "Merge "Make brightness transition to ON immediate if the screen was OFF because of close proxiity" into tm-qpr-dev am: e40c77a2" into tm-qpr-dev-plus-aosp am: d7f497cc

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



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