[automerger skipped] Merge 24Q3 to AOSP main am: 6acda35361 -s ours am: c560242b4f -s ours

am skip reason: Merged-In I07a98712e6f2fb3d1ce0a2e5f97693cdfbeb3582 with SHA-1 4336b37520 is already in history

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

Change-Id: I86ab7dfda1401dd45ab59b0021dc73177e2aa604
Signed-off-by: Automerger Merge Worker <[email protected]>