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

Change-Id: Ic7b2b0b33bb306e70d1bbdbed16db5704d6f7a92