Merge "Fix API in CaptivePortal and ConnectivityManager"
am: 8f4c739827

Change-Id: I4cc3c61232c74bafe4eb549c1aba5de20a8bb3ff