[automerger skipped] Merge "Merge ab/6749736 in stage." into stage-aosp-master...

[automerger skipped] Merge "Merge ab/6749736 in stage." into stage-aosp-master am: d31de2b8 -s ours am: 776d2a85 -s ours am: 961fe53a -s ours

am skip reason: Change-Id I869dc9ae03ddf2391bb1ee9c595cacd9c4bcc552 with SHA-1 3d232f21 is in history

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

Change-Id: Ieb3b0b05bbf01276a95855fa17621c7dc1f5b28d