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

* commit 'f0df354b0aa1880bae34034cc83ec472e5ff404e':
  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