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

* commit 'a4864d61dcf65341134887e347d11fbe9bb8a694':
  Rename wakelock held internally by SensorService.