[automerger skipped] Merge "[Passpoint] Remove R2 broadcasts" into qt-dev am: aac9c6e110 -s ours am: fffbb7e59b -s ours am: 36543bec49 -s ours am: c4029c7aef -s ours

am skip reason: Change-Id I25aba4c7a39150e9df483890f575d3e3767723be with SHA-1 0694bb8b06 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/11960546

Change-Id: Id7f6deefb940542fa3bd1631f282fcd68393ecaf