[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 4e8ca75a...

[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 4e8ca75a -s ours am: 97deb6c7 -s ours am: 68440205 -s ours am: ab2802d9 -s ours am: b4e60e58 -s ours

am skip reason: Change-Id Ia15239193be2685ac36da5a8fe13334900562ea0 with SHA-1 e3c6e9fc is in history

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

Change-Id: I10845734facfda57920ca0eed091c0475bf07c4e