[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-92def43caac0462a8e67863e0310a4b5" into android13-tests-dev am: 5355dd12 -s ours am: 7eb0f69e -s ours am: 7b661d9f -s ours am: 206d21f9 -s ours am: faa4179d -s ours am: ece0cc20 -s ours

am skip reason: Merged-In I3707d883d0daa4ffd2baa9bd69aebf4bf9ddef4e with SHA-1 82fa4811 is already in history

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



Change-Id: I307bb9d2c9247d01b0395481df616f1df4fa59e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>