[automerge] Small improvements to matchesCallFilter functionality 2p: 62a8ebb5a8

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

Bug: 183924362
Change-Id: I9b0111c1467e2d10041c87722311f1a069d195da
Merged-In: I29c39bf1e3d7dc69cc1f83854a23f6b33a6eac58