am 73b6750c: am 005d36d1: Merge "Fix a possible race condition in SensorManager initialization." into mnc-dr-dev am: a817c90a7a

* commit '73b6750cb6c3c9d5d7602878fd7020fa114a3cd3':
  Fix a possible race condition in SensorManager initialization.