[automerger skipped] Merge "Replace hidden CM#isNetworkSupported() usage" am: 976a18e9 am: 3ca15774 am: 9d451458 -s ours am: d5bb2b05 -s ours

am skip reason: skip tag Change-Id I713c6410fcf9543d54d9b0057ed7b2ecdab201ee with SHA-1 104cd7c1 is already in history

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

Change-Id: Ie0c04ef9c54f6eab14e315b7b50aa94cc0c9bdbc