[automerger skipped] Merge "Merge QQ3A.200805.001" am: 05dd19002b am: 96bcfca045 -s ours am: 4a0d01e6bd am: 02862a395e am: d61ddc5484

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

Change-Id: Ia6f665935a3a640bbbe610ea0798333603d830a3