Merge changes Ia33ca3d3,I9d42d14d

* changes:
  WifiConfigManager: Shell command to delete ephemeral networks
  WifiNetworkFactory: Don't bypass user approval if user forgets