Merge "Do not expect broadcasts in CaptivePortalTest"