Merge QQ3A.200605.002 into master

Bug: 158095402
Merged-In: I99ee98b78a5dd15714d20d3ab740fd4bb48c9d62
Change-Id: Idc370591826333b60d8339128db28f8bc6183e34
tree: 9656a739c70014d73d7ef8eab191482854df081a
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS