Merge "[Passpoint] Remove R2 broadcasts" into rvc-dev am: 8407fa56ee am: 66d2b558c5

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

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