Merge "Flake fix : Wait setting applied before returning from setConfig" am: f575d053d4

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

Change-Id: I48a2198fbeda337b3e12fb34161e9f80ae21b84e