fwb: tele: bring up to date with cm-10.1

Summary:
Squashed commit of the following:

  - ServiceState: add support for DCHSPAP

  - Fixing crash in PhoneNumberUtils getNumberFromIntent

      Handling intent with no data when trying to retrieve number from
      intent.

      AOSP commit: https://android-review.googlesource.com/#/c/57890/

Fixes T15

Test Plan: Ensure no *new* issues are created from this patch

Reviewers: randall.rushing, rlasalle15, Mustaavalkosta, Roach, synergy

Reviewed By: synergy

Maniphest Tasks: T15

Differential Revision: http://review.codefirex.com/D208