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

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

Change-Id: I3134f28723989b91995354979a1d710925733882