Merge "Replace ConnectivityManager hidden symbols on SettingsLib" am: 56b1b24940

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5a2fd69d93e6e4464291adb62944ac3bf38c39da