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

Change-Id: I537519602248894ccb0b99dee4ec31c5a8ebfd8e