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

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