Snap for 6470414 from 16bd0395e973941c7ef7cf3a3770e545b1ee4edc to mainline-release

Change-Id: I6bdac7b696a5e0d5cef7656a8f59cb824403bfd6
tree: 5a6c55661ef1be6bd0aef7b28dddba4aa8740c41
  1. api/
  2. java/
  3. Android.bp