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

Change-Id: Iffe5c969cff323a35769ea459978c2ec3dae8e45