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

* commit '4904821b212a3ee91f22a51295f86f6339cbcc8d':
  Rename wakelock held internally by SensorService.