Merge "Migrate first IpClientIntegrationTests to root" am: d1111745aa am: b39365b4a8 am: 3f69d7fded

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

Change-Id: I455dddb92646e472cae6be71e427016ef114f581