Merge "Merge 25Q1 (ab/BP1A.250305.020) to AOSP main" into main am: 8de85db27e am: 9fcdcfd02d

Original change: https://android-review.googlesource.com/c/platform/system/media/+/3531230

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