[automerger skipped] Merge "Merge Android R...

[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: 4ffca876 -s ours am: b1cfe126 -s ours

am skip reason: Change-Id Ie94127c1e981cb18671d5137ba0d39355d1353da with SHA-1 924eccfd is in history

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

Change-Id: I0816a5eaa48c495e7146fa38fa030169c17b1062