Merge "AsyncSensorManager: Fix unregistration bug" into oc-dr1-dev am: 6583c37a1b
am: 243edb8950

Change-Id: Id243c8bccd73509b83f2b3512808763a1b78cffd