Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE

Merged-In: Icc2368b2b4e4359026f74b9a0bf831868bc37253
Change-Id: I37d79a3012b91b1c01536ba2315f8837b3569619
tree: 36f412c3fbf1d96cc805715ce75aef7893c8f69a
  1. Android.bp
  2. AndroidManifest.xml
  3. OWNERS
  4. src/