Merge "decouple carrierdefaultapp from phone process"