Merge "Update frequency of WifiInfo upon connection or roam" into oc-dr1-dev
am: 5a19b6b8f6

Change-Id: I22bd71623d37133dec145b7802b68ceb9324649b