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

Change-Id: Ifb7fa6ccf70b0835c52716577a2f335e30c02b9a