Merge "move ACTION_CARRIER_SETUP intent to public api"
am: fcb37ffc60

Change-Id: Iaa09a2c35a88d58a6c6df4122bf7f1f87bd7075e