Merge 25Q1 (ab/BP1A.250305.020) to AOSP main am: 3ffdb886ef am: 9b0719e32f

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/3514617

Change-Id: I6624a7c7c44b2cc1b4c973c33fa738e10a4e00e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: db140f35199c7df9bf14f066f487d5d6ddcf3171
  1. apex/
  2. flags/