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

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

Change-Id: Ifd5d004971d6df9fccb402dccc3a3488a01b7dde