Merge changes I42d9361a,Iaa141f90,I8a6476ac

* changes:
  WifiServiceImpl: Mask networkId in WifiInfo if needed
  Revert "Revert "WifiConfigStore: Remove legacy modules""
  WifiServiceImpl: Factory reset