Merge "Fix a possible flake in disconnectFromWiFi" am: 1c4a66ddc4 am: 3d29edb485

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

Change-Id: I736c24d5572901d51340143dde79f4d2869327df