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

Change-Id: I23f1974dcc4bac2398a7595787cf910596af3f24