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

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

Change-Id: Ifc56f1a0c1f904e6a60f553ee368d24ab6490fc3