[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 skip reason: Change-Id Ie80eb3ba622ccf648790b1d3bf5d7c713fd0c296 with SHA-1 cbc4d4ec is in history

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

Change-Id: I4ed191317454c0389f73d1b468561ff457291ac1