[automerger skipped] Merge "Fix API in CaptivePortal and ConnectivityManager" am: 3c959339ae am: 79f2cf93d2
am: cd08ecfdfd -s ours
am skip reason: change_id I09545c00af3519dbf141dd5951b28f49e37b3e80 with SHA1 24ec3ff006 is in history

Change-Id: I793a60492ba7b63c6dea2937e7fc651a1ab617b9