Merge "Check for FEATURE_TELEPHONY instead of CM" am: 6df94880b3 am: 318bbccc3e

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

Change-Id: Idcb987bc2efef9fbbf947d5c7dc0630d7ad45ddc