Merge "Don't break things if a network goes back to CONNECTED." am: 1b14f762c7

Original change: undetermined

Change-Id: I1a4a2920a398ec1ed06a66c544e73ee42cb48398