Merge "IpConfigStoreTest: increase timeout for waitForIdle" am: e5d02b7ce9 am: 98da84480b

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

Change-Id: I2673b37cb42a47cfec4e7f7b5053ee0b7746c7e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>