Merge "Expose fields in WifiConfiguration." am: 1ea4180c3a
am: ce13838ade

Change-Id: Ia391a1b115646ad0409c5b52fee664d42901dd18