[automerger skipped] Merge "[Passpoint] Remove R2 broadcasts" into qt-dev am: 62962b32f7 -s ours am: 3cb61fb728 -s ours am: c117dfd70a -s ours am: ff3c7a93da -s ours am: 42bf82ccb0 -s ours

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

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

Change-Id: I9c0e6c32766739fa69850ebf3650595825aa5942
tree: 2049669dd9177aaaa82f4d1acf15f8a18206bf49
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg