Merge "decouple carrierdefaultapp from phone process"
am: e32fc81c5d

Change-Id: I3b03e57609ab649f01a45a6b70edca1402f80b3e