Merge "Remove NetworkMonitor dependency on ICaptivePortal"

Android.bp

api/system-current.txt

api/test-current.txt

core/java/android/net/ConnectivityManager.java

core/java/android/net/IConnectivityManager.aidl

core/java/android/net/INetworkMonitor.aidl

core/java/android/net/INetworkMonitorCallbacks.aidl

...workStack/src/com/android/server/NetworkStackService.java

...k/src/com/android/server/connectivity/NetworkMonitor.java

...c/com/android/server/connectivity/NetworkMonitorTest.java

...ces/core/java/com/android/server/ConnectivityService.java