Merge "Fix NPE for WifiConfiguration in AccessPoint." into nyc-dev
am: 32bd448cc1

Change-Id: I36857b40705fa91f80bfdff1843a9db7bcb382b1