[automerger skipped] Merge QQ3A.200605.002 into master am: 41abcf9aeb -s ours am: d7cb857a4e -s ours

am skip reason: Change-Id I719a82627239e6bbe937752622ddb209a8720772 with SHA-1 b8f0dc9bb4 is in history

Original change: https://android-review.googlesource.com/c/platform/external/libmpeg2/+/1323309

Change-Id: I69a69f0bd988eedd220f8aaab9932e871fe8a2c0