am 272f2321: am a0945b40: resolved conflicts for merge of 13ff7c17 to lmp-sprout-dev
am 272f2321: am a0945b40: resolved conflicts for merge of 13ff7c17 to lmp-sprout-dev

* commit '272f232181345089bd0f4a9b8356772204bcc0cb':
  Hide carrier app intents in Telephony (1/2)

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base