Merge "Add android version guard to ASensorManager_getInstanceForPackage"