Merge "WifiConfiguration: Fix isEnterprise" am: 9221c96ae0 am: e597198f12
am: 478bb2b44d

Change-Id: I4981990a4dc3aa1dde70625b93798a2fd6ff8263