[automerger skipped] Fix race between SensorManager ctor and callback am: 231a12189b am: 4245ab3a0f am: ade39600c5 am: 4158f80438 -s ours am: 3f33f7954b -s ours
am: c8801bd5ab -s ours
am skip reason: change_id If7421c452b5893ab2567323d265503a1ce304482 with SHA1 231a12189b is in history

Change-Id: I3997e30eef0b49f0fabd457bd7b21250b39673e5