Merge "Increase TEST_TIMEOUT_MS to 30s in the IpClientTest." am: ac715e4462 Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1853233 Change-Id: Id1e6eabaf2400e2352c8ab050b64e59ff01b5e78