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

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

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