Merge "Use WifiEntry.getStandardString() for Wi-Fi Type summary" into tm-dev