Merge "Rename wakelock held internally by SensorService." into mnc-dev