[automerger skipped] Merge "Merge android14-tests-dev" into main am: 0369b4ac67 -s ours am: 1c4a70f602 -s ours

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

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

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