Merge "Rely on S+ HDM interface priority for enabling Wifi when tethering" into main