[automerger skipped] Merge "WifiNetworkFactory: Coalesce scan results for matches" into rvc-qpr-dev am: 3dbfab9064 am: 20ffa771e0 -s ours

am skip reason: Change-Id I772663f03dcfb5b58fe2f36acec95da19459b111 with SHA-1 11edce9de1 is in history

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

Change-Id: I40511e5464d21a5f548b71aa9ef6d247f9939b99
tree: 97625a5159e274a1d4c27c691e05c4e8b28a4b11
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg