Merge "Fix a possible flake in disconnectFromWiFi" am: 1c4a66ddc4 am: 0061457a54

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

Change-Id: I6855dfc35028aeec5d3d5ae9200beeec06504032