Merge changes Ieddb7057,Ibaa31858 into rvc-dev

* changes:
  ClientModeImpl: Remove call to setScanningMacOui
  WifiShellCommand: Add a command for score update/reset external scorer
tree: 36d83ee199cfbbd5fd73eeae2f3fcccd456bf63d
  1. apex/
  2. service/
  3. PREUPLOAD.cfg