Automatic translation import

Change-Id: I8fc918f089e82024782799ef8a8ce5c64c0c9acb
Fix accesses to MmsSms.CONTENT_CONVERSATIONS_URI.

Because one of the columns was duplicated between MMS_ONLY_COLUMNS and
SMS_ONLY_COLUMNS, the last entry of UNION_COLUMNS was null, leading to
a NPE:

E/DatabaseUtils( 2728): java.lang.NullPointerException
E/DatabaseUtils( 2728):         at
android.database.sqlite.SQLiteQueryBuilder.buildUnionSubQuery(SQLiteQueryBuilder.java:540)
E/DatabaseUtils( 2728):         at
com.android.providers.telephony.MmsSmsProvider.getConversations(MmsSmsProvider.java:815)
E/DatabaseUtils( 2728):         at
com.android.providers.telephony.MmsSmsProvider.query(MmsSmsProvider.java:315)
E/DatabaseUtils( 2728):         at
android.content.ContentProvider.query(ContentProvider.java:857)
[...]

Change-Id: I9b08f37c40b0d4196900cdb169b0ec2570c875f1
Merge "Fix accesses to MmsSms.CONTENT_CONVERSATIONS_URI." into cm-11.0
blacklist: normalize phone numbers to E164 standard

Normalize to standard E164 with country support should perform better phone number matches.
xe: The brazilian user (country code +55) saves 6792928089 as blacklisted phone, but when
he receives a call from +556792928089 the blacklist provider doesn't match the number,
but both are the same number. Using E164, combined with SimCountryIso or LocaleCountryIso,
6792928089 will be stored as +556792928089, and during quering the provider the same format
will be applied for the incoming intent phone number, which will lead to a proper match.

Change-Id: I80c8330bfe3a13dca27557f795ee04781248f1a1
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Automatic translation import

Change-Id: I51b241ef5e15a68a441eec372c3e8d6dc534a522