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

Change-Id: I0f66eafb5129308674c0eceb4b8699bb4a32dd88