[automerger skipped] Merge "Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891" into stage-aosp-master am: 7d67d2c739 -s ours

am skip reason: Merged-In If7eb15543a141fa717b88c923276d801db3352ba with SHA-1 b029e264b9 is already in history

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

Change-Id: I37c2f9fc9538e69e708c33fb1c419e14289a5cb4