Merge "Fix Crash CarrierDefaultApp due to exception"
am: 0ec2348b85

Change-Id: I04f22351f158fb6db7ba62f680b8730fd8324f1f