Merge "Update WifiConfiguration in AccessPoint." into oc-dr1-dev
am: c93f7b215b

Change-Id: I8f9dfe61ec23118b5936a4e13428ebb6783718e5