[automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622"...

[automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master am: 1e61930e -s ours am: e1d50126 -s ours

am skip reason: Merged-In I4e1f802283bd70f8a8462fdcef1c7f976f7bc791 with SHA-1 326820d1 is already in history

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

Change-Id: Id0f34df75cfa9eb32405fc27f758083e8173036a