Merge "Fix NPE in DialerDatabaseHelper for null phone numbers"