Merge changes I2d88af7e,Ic0730eca

* changes:
  WifiNetworkSuggestion/Specifier: Fix javadoc
  wifi.proto: Add wifi config store IO duration metrics