Merge "Move ACTION_CARRIER_* intent and extras from TelephonyIntents to TelephonyManager." am: 53ae130d31 am: 82f3668df5

Change-Id: I4d8626c985f9021e03d4c2c0ef1adb18c142ca05