[automerger skipped] Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master am: c96c26077b -s ours am: caad89cf93 -s ours am: 5859946ca3 -s ours

am skip reason: Merged-In I745ef4d42ecaf06bb81d9dbe0b7162267fea65a8 with SHA-1 67ee516732 is already in history

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

Change-Id: I08d84c0061ba747769893b20c471439ff36a5765