Merge "IpConfigStoreTest: increase timeout for waitForIdle" am: e5d02b7ce9 am: a7d903c110 am: 67f6a83411

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

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