Merge "Add Carrier Presence to CP2: Phone" into m-wireless-dev