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

Change-Id: I461e62388d1e367ad030368712511e299f4d06bf