Merge changes I2c4acb33,I5352fbf7

* changes:
  [WifiNetworkSelector] Move OnConnectableListener
  [WifiNetworkSelector] Pass a callback to record candidates