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

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

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