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

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