[automerger skipped] Merge "Merge Android 12" am: 92da43cc -s ours am:...

[automerger skipped] Merge "Merge Android 12" am: 92da43cc -s ours am: b5669872 -s ours am: ee7d6941 -s ours am: f61161e5 -s ours am: cab88851 -s ours

am skip reason: Merged-In I46d721193aaba14fb8028dbe4ebe25b5ddb999ee with SHA-1 04abbff9 is already in history

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

Change-Id: Ia764da9ac651ddaec5dd84befbeed7ce8020b5cb