[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-21ce8922bf5e498bb030b1c2a53f476d" into android12L-tests-dev am: e37b15ad -s ours am: 71720334 -s ours am: d4f5b13f -s ours am: aa2f8380 -s ours am: 1f0274d6 -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: I805a4f0348d8835f39059b30886f46003d1a2a50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>