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

Change-Id: I638e568ed4c7b554cad141078f8546c7a35f2836