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

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

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

Change-Id: I830e44f43d0a013a3ba334a03653a56ac603d2da