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

Change-Id: Ibe9d16bbf1e794eb05166ad9c6bccb3ad5bcae9d