[automerger skipped] [Passpoint] Remove R2 broadcasts am: bfaadd48df -s ours

am skip reason: skipped by user haishalom

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

Change-Id: I6a90d4747ae417eefee96d3df61df6744e9fe5ea
tree: 784206b7c742b0f8cb7ac16f8f7834a47f14ebda
  1. service/
  2. PREUPLOAD.cfg