Small improvements to matchesCallFilter functionality

Check both NORMALIZED_NUMBER and NUMBER for a phone call contact, in case one or the other is populated but not both, for more phone number coverage.

Use Uri.decode instead of URLDecoder as it seems simpler and more directly relevant.

Bug: 183924362
Test: NotificationManagerTest, ValidateNotificationPeopleTest, ZenModeFilteringTest
Change-Id: I29c39bf1e3d7dc69cc1f83854a23f6b33a6eac58
Merged-In: I29c39bf1e3d7dc69cc1f83854a23f6b33a6eac58
(cherry picked from commit b9290319)