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