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

Change-Id: I6c5fd9d65202fd9b7f2c784d84e5b2dbbff7b6d2