Merge "Make it possible to shut down and recreate IpClient in a test." am:...

Merge "Make it possible to shut down and recreate IpClient in a test." am: 9f48429f am: a9be470b am: 84d2a743 am: 25096474 am: 1c5184c9 am: 1f4a4523

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

Change-Id: Ib4d275af21079ad98c0f7e86a34d5aa6629cadf3