Merge "Add a method to start the captive portal login app." into oc-dev

am: 5555b1e3d1

Change-Id: Ic7c14bd3dfd07f97c04901f043ed1cd3b1eee6e4

diff --cc core/java/android/net/ConnectivityManager.java
Simple merge

diff --cc core/java/android/net/IConnectivityManager.aidl
Simple merge

diff --cc services/core/java/com/android/server/ConnectivityService.java
Simple merge

diff --cc services/core/java/com/android/server/connectivity/NetworkMonitor.java
Simple merge

diff --cc tests/net/java/com/android/server/ConnectivityServiceTest.java
Simple merge