am 6799d450: (-s ours) am 95e1b1a3: (-s ours) Use TelephonyIntents - DO NOT MERGE

* commit '6799d450c4f0e129eb5c414a93dc553d7058e941':
  Use TelephonyIntents - DO NOT MERGE