Merge "Merge "Fix Crash CarrierDefaultApp due to exception" am: 0ec2348b85 am: 9d2c715d37 am: b20b5cc812" into oc-mr1-dev-plus-aosp
am: 1f4a5f8848

Change-Id: Ic85ade8384be8cd27248374b8998f63025c74024