Merge "Call getInstanceForPackage instead of creating a new SensorManager instance." into mnc-dr-dev