Merge "Merge 25Q1 (ab/BP1A.250305.020) to AOSP main" into main am: 870cda8ae1 am: 66091714a4

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/30597977

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