[automerger skipped] Merge "DO NOT MERGE - Skip rvc-qpr-dev-plus-aosp-without-vendor@6881855" into stage-aosp-master am: cfd694f7 -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: I00a94853a371c259b7c9fe0dba40608a4a564193