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

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

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