[automerger skipped] Merge "Replace ConnectivityManager hidden symbols on...

[automerger skipped] Merge "Replace ConnectivityManager hidden symbols on SettingsLib" am: 56b1b249 am: cf996f7f am: a8ebd89c -s ours am: f276fa02

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0b3c30c225621e907879da71139a24d997175408