[automerger skipped] Merge "Merge QQ3A.200805.001" am: 05dd1900 am:...

[automerger skipped] Merge "Merge QQ3A.200805.001" am: 05dd1900 am: 96bcfca0 -s ours am: 4a0d01e6 am: 02862a39

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

Change-Id: I690bda883775387846a624f525511b6bd7c43d86