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

Change-Id: I6422cf0ec7ba150d8ab3e8c0a88fb3e9a3a2a4b9