am 8fafeb28: am df4f2629: am a1b4d2de: am 22e42b48: resolved conflicts for 3e4042eb to mnc-dev

* commit '8fafeb28797eb5ff96ebde62b1e7178ab56f29fe':
  CTS: verify ConnectivityManager.requestNetwork throws for restricted networks
tree: 76b975eeb95551e6bd5fc3ee315d47efe7826ab5
  1. tests/