[automerger skipped] Merge "Fix API in CaptivePortal and ConnectivityManager" am: 8f4c739827 am: 648de2131b
am: c8acc61655 -s ours
am skip reason: change_id I09545c00af3519dbf141dd5951b28f49e37b3e80 with SHA1 d6d5505edf is in history

Change-Id: I793a60492ba7b63c6dea2937e7fc651a1ab617b9