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

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

Change-Id: I143b15be049b955bf5dc2a74c4d82b9b711a1ce7