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

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