[automerger skipped] Merge 24Q4 (ab/12406339) into aosp-main-future am: 1b88dcfdb2 -s ours

am skip reason: Merged-In I4c21309c0898a52332be8e9f9483c92b59cc08c5 with SHA-1 f0882fabbe is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/30285419

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