Snap for 6497471 from 019f1c532c13cf47f5fc3e935bbd497dd13f1602 to mainline-release

Change-Id: Iab657fa7b239d146a60a7b8ce77cfeff9a4c875e
tree: c45e98e7f8b8888658a589b1ac4e808862e2cf8a
  1. api/
  2. java/
  3. Android.bp