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

Change-Id: I7b3211e38935293dca7979816095d6b7a5613e10