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

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

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