Merge QQ3A.200605.002 into master

Bug: 158095402
Merged-In: I1988780d0e4ee7fb18b536e0381160a5e56409b0
Change-Id: Ia6c571f95e292689996f88a3094ca01232b772ad
tree: 1f02c035ddd8c01d89cf4365fbff860fc2e358a9
  1. Android.bp
  2. AndroidManifest.xml
  3. PREUPLOAD.cfg
  4. res/
  5. src/
  6. tests/