[automerger skipped] Merge "Merge aosp-24Q3-ts-dev" into aosp-main-future am: a10e6e0e -s ours

am skip reason: Merged-In I5300086f7ae36d3b5e358e62e596001ecd32f572 with SHA-1 d8a822db is already in history

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



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