Merge "Added case to change WifiStatusTracker SSID to Passpoint friendly name"