[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 2ee3028b36 -s ours am: 179ebc697e -s ours am: 658fa7f244 -s ours

am skip reason: Change-Id I56de1383532958604d92add58f86dfc001407477 with SHA-1 17cf9d21c6 is in history

Original change: https://android-review.googlesource.com/c/platform/external/libyuv/+/1323595

Change-Id: I1c7516b3c1a73b13d7cf4dfbb218da557d018a2c