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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic9b205efdc6d5a1c0749e2fa57cdae9aa98ffaf3