Merge QQ3A.200605.002 into master

Bug: 158095402
Merged-In: I64135373d30eb0b3fff00857c0909130bd0891f9
Change-Id: I33ff66deda9edc4db1bc52704a56fe4b1cf1e12f
tree: 8c7762d6abbc3507b14ef36fa209160cc6b543e7
  1. 1.1/
  2. 1.2/
  3. extns/
  4. halimpl/
  5. Android.bp
  6. METADATA
  7. OWNERS