Merge "Don't leak captive portal broadcast receivers."
am: 873badbd1c

Change-Id: I33a70877db8ae1af5e2e2130b22670437f6ac34f