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: Iee56a747ef47ca48a27d6f5abbc3352667fbaef3