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

Change-Id: I1a189c49f1ca8c0a8c12f1c834d90f61d25fc470