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

am skip reason: subject contains skip directive

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

Change-Id: I813df8bb365e3ec04ea733f3442c032f6b51a4d6