Merge "Add android version guard to ASensorManager_getInstanceForPackage" am: 18510e1f6f am: 0cb1c49243 am: 20af756089
am: 399127ef35

Change-Id: I55c9499d7763a0407f8968edd92f331c859316c3