am 1c7c3556: Merge change 25634 into eclair

Merge commit '1c7c355626ea870605beab6dc07d8ac7509a8b80' into eclair-plus-aosp

* commit '1c7c355626ea870605beab6dc07d8ac7509a8b80':
  Report NO_CONNECTIVITY when failover net unavail