[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: 3f33f795 -s ours am: c8801bd5 -s ours
am: d0fb1658 -s ours
am skip reason: change_id If7421c452b5893ab2567323d265503a1ce304482 with SHA1 231a1218 is in history

Change-Id: I4f24b84088767f9c253e64f0ad7560236e363c0b