Merge "Fix a possible race condition in SensorManager initialization." into mnc-dr-dev