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

Change-Id: I3a1f7808a4ce44f96753cb875ff914985151b208