Merge "decouple carrierdefaultapp from phone process" am: e32fc81c5d am: 1fdd29d799
am: 780c1cc26d

Change-Id: Ib46becf994bba0c18b4a58af494331baa0c78959