Merge "WifiEnterpriseConfig: Refactor set/get field values" am: c4856bd73c
am: 655ae32d57

Change-Id: I2c5652450f774ed7841763898be7e3850af111a9