Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master am: e534ce4c55

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

Change-Id: Ifa2b5acadbafc983ab3f73fcef21dc1152e7037d