Merge "Merge "AsyncSensorManager: Fix unregistration bug" into oc-dr1-dev am: 6583c37a1b am: 569b01b83a" into oc-mr1-dev-plus-aosp