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

Change-Id: I6bef532634cc0b61d1446c57f0c59c45f2c8ad25