Merge QQ3A.200605.002 into master

Bug: 158095402
Merged-In: I1007969012c5ec4da9230d8f6858b1f6044004d0
Change-Id: I101bada78a6e13c339f4349c418292eb6a52940e
tree: 5ecd979c364a480fb454c9431ed1260e37bf047e
  1. assets/
  2. res/
  3. src/
  4. tests/
  5. Android.bp
  6. AndroidManifest.xml
  7. OWNERS
  8. PREUPLOAD.cfg