DO NOT MERGE - Merge QQ2A.200305.003 into stage-aosp-master

Bug: 150410372
Change-Id: Ie96f36553f168c9528f20a503a450c8c977cf1e2
Merged-In: I3e3342d09fef20947e3b744d2050805aad777e29
tree: 25262c115ee53a0576886637b8acbe386033a1c6
  1. src/
  2. Android.bp
  3. AndroidManifest.xml
  4. OWNERS