[automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master am: e534ce4c55 -s ours am: 2790b1fc6e -s ours

am skip reason: Merged-In I5a33f959c8ae5a34584f57508f392038e44062e7 with SHA-1 17bc178920 is already in history

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

Change-Id: I5a6eee741f083302c2734dadd83b8f4fb7d615b8