am 36b21a66: am 19060d9f: am 170b6ab7: am a4864d61: am 4904821b: Merge "Rename wakelock held internally by SensorService." into mnc-dev

* commit '36b21a6626cddad16beff421bfdc67965d1abb84':
  Rename wakelock held internally by SensorService.