Merge "Update test to verify more cases" am: 0d374c3592

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

Change-Id: Ie3c21225361e263460ef693c57dd11a261964527
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>