[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 316e24b893 -s ours am: 0cf3d6edc0 -s ours am: 18b552e290 -s ours

am skip reason: Change-Id I868dcbbf0785c9ef05e4c794d9ab8483ced2cd6d with SHA-1 c68c7e8f71 is in history

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

Change-Id: I1067ac317dd6866c3d27580d5a50d1142b2b0aa0