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

* commit 'c9ab5af9f2a811e2b6459b077092c29ca13b6f6d':
  CTS: verify ConnectivityManager.requestNetwork throws for restricted networks
tree: 2041be3309bee938779888cd0d8dace797139c5f
  1. tests/