Merge mainline-release 6664920 to master - DO NOT MERGE

Merged-In: Ic4a98d40d969ed99967477a1eae7f424bd833091
Change-Id: I968fc0cdbf857cfa77c1bf73119e28b5b6c8ca19
tree: 385268d23e25615622ae70e243bc2d1b956d49f6
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS