Merge "Update frequency of WifiInfo upon connection or roam" into oc-dr1-dev