Merge "Merge "Fix Crash CarrierDefaultApp due to exception" am: 0ec2348b am: 9d2c715d am: b20b5cc8" into oc-mr1-dev-plus-aosp