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

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

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



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