[automerger skipped] [Passpoint] Remove R2 broadcasts am: bfaadd48df -s ours am: 99f9651d10 -s ours am: 9c389c97b8 -s ours am: c0595553b6 -s ours am: 042c2fb0dc -s ours

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

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

Change-Id: I3ded6fa24af9747f98a73ab1ec486c4af4fd747b
tree: cd3a012bf8d912a4e7e57f00f0686f6d3d49ceb5
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg