[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE...

[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 088ff633 am: 303b2641 -s ours am: d011fc44 -s ours am: cec4aed8 -s ours am: f0d2b3a3 -s ours

am skip reason: Change-Id I09503c3e461299afc4d58c69d235369857797d9b with SHA-1 3f69d7fd is in history

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

Change-Id: I3f3dc4f35a1bee8a1ade7bb0ce5e918f0c318b0d