[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: bf76b844cc -s ours

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

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

Change-Id: Id507517c3dd6e2bc1bd57eed0fefb46ed338c1c9