Merge "Fix NPE for WifiConfiguration in AccessPoint." into nyc-dev am: 32bd448cc1 am: 9c4561370d am: 9096780031
am: 1c49ec372b

Change-Id: I38d7255f965de9a10726aaa04078a5ae4b061421