Merge "Merge "Unhide WifiConfiguration proxy accessors" am: c82d1ddaf4 am: d2f5fd3c42 am: 878fcfaa22 am: 424650dd52  -s ours"