Merge "Ensure Wifi eventually becomes default" am: bb80403f60

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

Change-Id: I239dff9163cc3252607aeab06eb26f44f1cef549
Signed-off-by: Automerger Merge Worker <[email protected]>