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

Change-Id: I08235edf6f406da1510a3e6baf01a65001c37129