Merge "Flake fix : Wait setting applied before returning from setConfig" am: 1c00db5d3b am: fc2b620461

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

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