[automerger skipped] Merge "Replace CM#isNetworkSupported() with checking FEATURE_TELEPHONY" am: ac06b167 am: 9214c04e am: cc0de009 -s ours am: 637fe034 -s ours

am skip reason: skip tag Change-Id I457459554e5e6fe0874b8db81c6547035a6603b8 with SHA-1 3fb8626b is already in history

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

Change-Id: I5dcbb2d7d8c70deabbbe8f9625178e06ac2830ed