[automerger skipped] Merge "Merge 25Q1 (ab/BP1A.250305.020) to...

[automerger skipped] Merge "Merge 25Q1 (ab/BP1A.250305.020) to aosp-main-future" into aosp-main-future am: 2e2ea9c1 -s ours

am skip reason: Merged-In I8c955496f75d167b46e812b79a0d970f8ed27581 with SHA-1 5c862f3a is already in history

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



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