[automerger skipped] DO NOT MERGE - Skip ab/7272582 am: e33ddc73 -s ours am:...

[automerger skipped] DO NOT MERGE - Skip ab/7272582 am: e33ddc73 -s ours am: 2c138468 -s ours am: e40f1975 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I65167fc5a31a06f79cc86eecfe55f832eb39289d