[automerger skipped] Merge 24Q4 into AOSP main am: 8add736aec -s ours

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

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

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