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