Merge "Correct the check for capability" am: 7af2e70f7b am: 7e3756c4bd am: 82ec278ee7

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1640504

Change-Id: I67e7ca8f2c2052c0e79f25e4c44eebd730ead222