[automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am:...

[automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: 46f51659 -s ours am: a7212476 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4bad91fcd3c5c6f680b581aef064028a2bfb6da3