[automerger skipped] Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE am: e923484641 -s ours am: 088e3cb390 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1763471 Change-Id: I9c5b8b7ce378b062bc84f2e7f36072def5cf54a0