[automerger skipped] Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE am: e923484641 -s ours am: 088e3cb390 -s ours

am skip reason: Merged-In I096ef2def0a5c627ca9f1c8528d67dd7591628fe with SHA-1 9108c3c668 is already in history

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

Change-Id: I02a7301aeec79c73a787f78c2d635cc0da652f06