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

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

Change-Id: Ib1f1897fdc8af977b12d955bc7f4bb52c802cae0