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

* commit '005d36d1b0653fccc5aaea2af36a2622f6d74f34':
  Fix a possible race condition in SensorManager initialization.