Merge "Merge ab/AP4A.240925.013 into aosp-main-future" into aosp-main-future am: 07410446e4

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

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