Merge "Avoid showing "Problem connecting" for Android Auto" into main