Merge "Test that IpClient does not leak fds on shutdown." am: e0ddb33c am:...

Merge "Test that IpClient does not leak fds on shutdown." am: e0ddb33c am: 735cfe80 am: 8f1b34e1 am: 1a9d376f

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

Change-Id: Iaf8b66e3e96b8b842cdd4b9b484c83439e86b706