Merge "Refactor SensorManager to move non-API bits into a subclass."