Merge "WiFiCallingSettings: don't start carrier app in onResume" am: 05c88316ec
am: e21cbcb6b4

Change-Id: If09bb76b63b0e71d3fa9cf6a42c2436e52093d6a