Merge "WifiConfiguration: add local only networkId" into oc-dev am: 46f4d5c4a6
am: 0ffff6a341

Change-Id: I84c310c491dff17f193e8e7942c2ba90798e65b9