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

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

Change-Id: I7722a85af54b21acf1882810df203b3bb833d530