[automerger skipped] Merge "DO NOT MERGE - Skip...

[automerger skipped] Merge "DO NOT MERGE - Skip rvc-qpr-dev-plus-aosp-without-vendor@6881855" into stage-aosp-master am: cfd694f7 -s ours am: 248a24a5 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4fe4b1b9679bca4f145c680350d45733efb751bd