[automerger skipped] Merge Android R...

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: a0779c5b -s ours am: 673a580e -s ours am: 614125d2 -s ours

am skip reason: Change-Id I5488a17d4c224f54d1c1e97da1f1cc0c1b294950 with SHA-1 f0babce2 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/netd/+/12470344

Change-Id: I5a7cb8578337f951a2c45d92f8e7941490b52653