Work sensibly with CLIR contact numbers

Allow phone numbers which are saved in the phonebook including a
CLIR prefix to be:

a) correctly resolved to the contact on incoming messages

b) used for outgoing SMS by stripping the CLIR prefix
   (which is not valid for SMS, only for voice dialling)

This is similar to http://review.cyanogenmod.org/#/c/13697/
but for Messaging, not Phone.

Change-Id: Iff370353bfae94343d968239af86ee9a38bd1741
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2