Merge "Merge "Improved connectivity check by also asserting NetworkInfo states." into nyc-dev am: fe6dc2b966 am: 00cf921893" into nyc-mr1-dev-plus-aosp