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

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

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



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