[automerger skipped] Merge SP1A.210812.016 am: b77c91c9 -s ours am:...

[automerger skipped] Merge SP1A.210812.016 am: b77c91c9 -s ours am: c876b058 -s ours am: 4e836155 -s ours

am skip reason: Merged-In I6b83b5a30b2768b45d2982e7978aaf6a9d892c40 with SHA-1 0cdba576 is already in history

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

Change-Id: I7885648e3e237e2500940c2d505a3d3bc0342771