[automerger skipped] Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8084891" into stage-aosp-master am: bfa7b1a197 -s ours am: ca138ddb93 -s ours

am skip reason: Merged-In I5894450f3089b2ea105722a18ddf8f1eed1c28a0 with SHA-1 9c8061134c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/16844278

Change-Id: I89c2d239e7e446dc75d88d9d502909add5146360