Merge "Refactor stopping the screen off brightness sensor controller" into...

Merge "Refactor stopping the screen off brightness sensor controller" into tm-qpr-dev am: 12dbc309

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



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