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

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

Change-Id: Ie0be9d879083d26c79d16f85feb3b6f9dc9a55e4