[automerger skipped] Merge "Address aosp/1199568 leftover comments" into...

[automerger skipped] Merge "Address aosp/1199568 leftover comments" into rvc-dev am: 928c1ea8 am: 7b6e066c am: a9b19576 -s ours

am skip reason: Change-Id I6e4f16e70b290ce6a3566b92e5946c65075971a1 with SHA-1 fc142de7 is in history

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

Change-Id: I3611dd46f6ae047a82c03d4330c1849bb856e3f8