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

* commit '170b6ab7e4fbc87d150bdeb2b5f04e8bf074da96':
  Rename wakelock held internally by SensorService.