[automerger skipped] [Passpoint] Remove R2 broadcasts am: bfaadd48df -s ours am: 99f9651d10 -s ours am: 9c389c97b8 -s ours am: c0595553b6 -s ours am: 3d0785ba40 -s ours am: 66317b44f4 -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: I3da39c7b16ccca306e05b7422e2b6fc1e2b76e8e
tree: 2049669dd9177aaaa82f4d1acf15f8a18206bf49
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg