Merge "Fix race between SensorManager ctor and callback" into qt-dev
am: 4f398669a4

Change-Id: I2a41b1af98dbd0ee7c2743f3fe5198ca351d8ed8