[automerger skipped] Merge android14-tests-dev am: c1dae204 -s ours am: 31bfeb3d -s ours

am skip reason: Merged-In I8084b48b4a181e87bd151bc2870eddad36ae3a0b with SHA-1 53b1871b is already in history

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



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