Merge "Merge "Ensure that DozeSensors can unregister itself." into rvc-dev am:...
Merge "Merge "Ensure that DozeSensors can unregister itself." into rvc-dev am: 2adebfde am: b1284559" into rvc-d1-dev-plus-aosp am: 05689a20
Change-Id: Id0cfef17c32ae6718e50b11cd12f9855513e2053