Merge "Run NetworkStackIntegrationTest with Parameterized.class." am: 2ac4d2b827 am: 0547467eae

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

Change-Id: I8efe0623871b590cb8da6bca196d915bf1932d80