Merge "Disable additional logging in WifiConfigStore/WifiNative" into klp-dev