Merge mainline-release 6664920 to master - DO NOT MERGE

Merged-In: Ib0904bbbd0d3b7888bbddafb149b93e6b657a3cd
Change-Id: Iac27b060b8cf78766e92079972c74aa27c1b750a
tree: 004f9a297e2138ac3b087e0e1a799d996837a741
  1. src/
  2. Android.bp
  3. AndroidManifest.xml
  4. OWNERS