Merge "Stop the screen off brightness sensor controller" into tm-qpr-dev am: 3fce317e

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



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