Merge changes I88af4e2d,I85cc20bd into rvc-dev

* changes:
  WifiNetworkFactory: Stop scanning once user selects a network
  ConfigurationMap: Don't cache specifier ScanResultMatchInfo
tree: 2ec0a0ebe2cb14ade4d4281a61161f409acec759
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg