[automerger skipped] Merge "Don't leak captive portal broadcast receivers." into qt-dev am: 15bff87527 -s ours
am: 916159726d -s ours
am skip reason: change_id I1db24fe05ada8b3a37a9a60aa568b6153bf51ad8 with SHA1 3a1c0ad3ee is in history

Change-Id: Icc0c7972ddaabdb1d1834d62eebeafe2092eebeb