am 4d87d91d: Merge "If in a mobile captive portal is detected enable fail fast." into jb-mr2-dev

...java/android/bluetooth/BluetoothTetheringDataTracker.java

core/java/android/net/BaseNetworkStateTracker.java

core/java/android/net/CaptivePortalTracker.java

core/java/android/net/ConnectivityManager.java

core/java/android/net/DummyDataStateTracker.java

core/java/android/net/EthernetDataTracker.java

core/java/android/net/IConnectivityManager.aidl

core/java/android/net/MobileDataStateTracker.java

core/java/android/net/NetworkStateTracker.java

services/java/com/android/server/ConnectivityService.java

wifi/java/android/net/wifi/WifiStateMachine.java

wifi/java/android/net/wifi/WifiStateTracker.java