Merge "Unhide WifiConfiguration proxy accessors" am: c82d1ddaf4
am: d2f5fd3c42

Change-Id: I20fbec10c7a3355d80a305583308095954ff5488