[automerger skipped] Merge changes from topic "am-92def43caac0462a8e67863e0310a4b5" into android13-tests-dev am: 5355dd1224 -s ours am: 1c5a228a84 -s ours am: eed57e550b -s ours am: 14a7e548bd -s ours am: 9ad1829b6e -s ours am: 0420c9d68d -s ours

am skip reason: Merged-In I3707d883d0daa4ffd2baa9bd69aebf4bf9ddef4e with SHA-1 5c6daae040 is already in history

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

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