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