Merge "Merge "Mark android12L-tests-dev@8941410 as merged." into android13-tests-dev am: 6e4bd3a4b3" am: c4241b1016 am: 265beed95b am: 4d10aaf5df am: 489da9335c am: 327deb8f0d

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

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