[automerger skipped] Merge "Do not expect broadcasts in CaptivePortalTest" into mainline-prod am: a3bb10ba80 -s ours
am skip reason: Change-Id Ie4ee6b3c3ed7c0d414fd3cc162d4183248120895 with SHA-1 48ea3b6816 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/12855996
Change-Id: I5f242cb828efb44cde91c9adc25751250fc123b4
This commit is contained in: