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

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

Change-Id: I4515c0e829bea15885850e07e8252bdfd45d0397