[automerger skipped] Merge "Move ACTION_CARRIER_* intent and extras from TelephonyIntents to TelephonyManager." am: 798dedb3b0 am: 156c6bf4b7 am: 959f997e77 -s ours
am skip reason: Change-Id Ie74f20a7e6a47a4c478acfdb02634bc735aa2edb with SHA-1 90c23da1ae is in history

Change-Id: I2e7718699bb297bf7421c54264cafa9fa88d7bac