[automerger skipped] Merge "Small improvements to matchesCallFilter...

[automerger skipped] Merge "Small improvements to matchesCallFilter functionality" into sc-v2-dev am: 2a54e74e -s ours am: dd20ad2a -s ours

am skip reason: Merged-In I29c39bf1e3d7dc69cc1f83854a23f6b33a6eac58 with SHA-1 62a8ebb5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17221226

Change-Id: I96154036e3759fbee06b910e4b94dcf488318b41