[automerger skipped] Fix race between SensorManager ctor and callback am:...
[automerger skipped] Fix race between SensorManager ctor and callback am: 231a1218 am: 4245ab3a am: ade39600
am: 4158f804 -s ours
am skip reason: change_id If7421c452b5893ab2567323d265503a1ce304482 with SHA1 8bbd6f4f is in history
Change-Id: I66f7d1c8289030ddfb1dcad68f6d8bc54946332e