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

* commit '95e1b1a34e0c97e313a351d902d46d9ee571f511':
  Use TelephonyIntents - DO NOT MERGE