Merge "Replace CM#isNetworkSupported() with checking FEATURE_TELEPHONY" am: ac06b167f9 am: 9214c04e45

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

Change-Id: I9428a5954d7461f6e8ae0e1a28cf9a3ecc4a7859