[automerger skipped] Merge "Merge Android R...

[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: 95cd1ff4 -s ours am: f59a12d5 -s ours am: c917db65 -s ours

am skip reason: Change-Id Id3231d5748c6ec246fb4e9c2b57a8fe3b9f4cad9 with SHA-1 785bd04e is in history

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

Change-Id: I14b3fdd9f7ad76cc0b50642a66c91d93be85019e