[automerger skipped] Merge "[Passpoint] Remove R2 broadcasts" into qt-dev am: 62962b32f7 -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: Ib72dcb94d20e26f8ffb3f4dceb1b6218b8d4fb8a
tree: 670a517448670a23b6fcc2e1e0f3e5fd48084374
  1. service/
  2. PREUPLOAD.cfg