Merge "Do not expect broadcasts in CaptivePortalTest" am: b54ca7b0c3

Original change: https://android-review.googlesource.com/c/platform/cts/+/1459764

Change-Id: I3efaa542deef2964082637cfbf7d6cac17a38fa8