[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 2a153ae758 -s ours am: 83a0d00349 -s ours am: 5d2b9a4c10 -s ours

am skip reason: Change-Id I69a69f0bd988eedd220f8aaab9932e871fe8a2c0 with SHA-1 23442489fb is in history

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

Change-Id: I5469777d6572d3aed6e9f3c48b6e162e5b228def