Snap for 6469672 from f3c76c7ec86e80fc965818cd91ed853bbb1cd8b0 to rvc-release

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