[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-53723217c4054f878b577ab8985c4313" into android13-tests-dev am: 8464b75f -s ours am: 3fc00c6a -s ours am: 33f137c0 -s ours am: f76c5f33 -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/+/2198959



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