[automerger skipped] Merge "Refactor stopping the screen off brightness sensor...

[automerger skipped] Merge "Refactor stopping the screen off brightness sensor controller" into tm-qpr-dev am: 12dbc309 am: 281aa083 -s ours am: 0e415f25 -s ours

am skip reason: Merged-In I57bfbef2830e30289368a0e0ad8df5ec46607e10 with SHA-1 e31de87e is already in history

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



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