am 4aac30fa: am 8fcb5697: am ff01fcec: am 7157c2ca: Merge "Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."" into mnc-dev

* commit '4aac30faf253047fb68358ae6acb7a76e7023c81':
  Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."