[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: bf76b844 -s ours am: d6fbd84b -s ours am: 974dc0e2 -s ours

am skip reason: Change-Id Iacddb8afef9729cb7096e3247178b87409942437 with SHA-1 4622782c is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1323237

Change-Id: I479718bd55123c1427de68ecc5155da4c4e80b78