[automerger skipped] [Passpoint] Remove R2 broadcasts am: bfaadd48df -s ours am: 99f9651d10 -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: I8fdce7606dc58031e0df026875b86e4dd15fa98b
tree: 670a517448670a23b6fcc2e1e0f3e5fd48084374
  1. service/
  2. PREUPLOAD.cfg