[automerger skipped] Merge ab/AP4A.240925.013 into aosp-main-future am: 02abdecef3 -s ours

am skip reason: Merged-In I0d5ae482f51fd590946fca0e9a98fa9b8a0b0fa2 with SHA-1 1b8ffa7eb9 is already in history

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

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