Merge QQ3A.200605.002 into master

Bug: 158095402
Merged-In: If6564773114129fd593cc67cc1fff3012444f40d
Change-Id: I5fdee96b6f699ad987f904dbf0d1b87057cf5fd8
tree: aa6e30ad58901cdf7180f5093950add309037942
  1. Android.bp
  2. AndroidManifest.xml
  3. OWNERS
  4. res/
  5. src/