[automerger skipped] Merge "Merge Android 12L" am: 559ec615 -s ours am:...

[automerger skipped] Merge "Merge Android 12L" am: 559ec615 -s ours am: 664596a7 -s ours am: a5783932 -s ours am: 120cc3ad -s ours

am skip reason: Merged-In I968601ea0aef02f03ecfc0d09049efb13ecda483 with SHA-1 ccb3f81f is already in history

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

Change-Id: I0efdd3f6088b3d3ab79c7504efacd1c5193ce671