Merge QQ3A.200605.002 into master

Bug: 158095402
Merged-In: Idbb54a5542a7c734c12403928e812141e2c56eb0
Change-Id: I05f97636e516381ec26743851226b5919215514c
tree: 587a3b49ca83cd9dc8c9c863b34cfbfeab118769
  1. src/
  2. tests/
  3. Android.bp
  4. OWNERS