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

Change-Id: Iddb1191aa59d0466754de8d6f12f9b31e7138985