[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: 88cecddb69 -s ours

am skip reason: Merged-In I80978aa2be6edabd6a09f22be2c561e1bdb64f78 with SHA-1 460fde2bc1 is already in history

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

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