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

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

Change-Id: Icd86602886d2bd649412385f75edd1e4613568b3