Merge "Replace hidden CM#isNetworkSupported() usage" am: 976a18e914

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

Change-Id: I0ec433ac0403fa2189c6424acf963aea1f324410