Merge "Stop the screen off brightness sensor controller" into udc-dev am: 4431647f

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



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