[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-5808bd12eaf74f6dbbd5331cd6251b44" into android13-tests-dev am: 35c4a65c -s ours am: 30bebe5f -s ours

am skip reason: Merged-In I840068aa1ba5ea3b19b855347d45221875b773e9 with SHA-1 4d21ce0d is already in history

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



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