[automerger skipped] Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE am:...

[automerger skipped] Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE am: e9234846 -s ours am: 088e3cb3 -s ours am: 03563d0b -s ours

am skip reason: subject contains skip directive

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

Change-Id: Icad0b05161eac215377b58b6415d739b49777dbf