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

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

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

Change-Id: Ibec9ad85b6c2b9d0255d25450971138e08eb72eb
tree: 9912b1181d6c46df0193bd65207f821ab903593f
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg