am 5770c553: (-s ours) am c2aaf355: Merge "Update CTS for unsupported legacy ConnectivityManager APIs" into mnc-dev

* commit '5770c553a8cfe05256c94241893e256560c7d25f':