Merge "Merge 25Q1 (ab/BP1A.250305.020) to AOSP main" into main am: db5bc268e2

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

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