Merge "WiFiCallingSettings: don't start carrier app in onResume"