[automerger skipped] Merge "[Passpoint] Remove R2 broadcasts" into qt-dev am: 62962b32f7 -s ours am: 3cb61fb728 -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/+/11960546

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