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

Change-Id: I1232829112d6f5ba5fa99199555e584c91ae35af