Update getNumberFromIntent() to read from both providers.

This method is used by the Phone app to decode ACTION_CALL
Intents, resolving to a real phone number.  Because the
columns are changing with the new provider, I added logic
to query using the correct columns for the authority of the
requested Uri.