[automerger skipped] Merge "Merge 25Q1 (ab/BP1A.250305.020) to AOSP main" into main am: 9e67fd6d31 am: 4289f97705 -s ours

am skip reason: Merged-In I04f90b42907d07c6111a7b41a531f7717df33672 with SHA-1 f29f29cdc0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31573386

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