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

Change-Id: I61e38ddb693be086ef943bab2c9975aae096d9a6