Merge "Fix API in CaptivePortal and ConnectivityManager" am: 3c959339ae
am: 79f2cf93d2

Change-Id: Ibe9d16bbf1e794eb05166ad9c6bccb3ad5bcae9d