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

[automerger skipped] Merge "Replace ConnectivityManager hidden symbols on Settings" am: cbcea320 am: 995581e8 am: 155d4d6c -s ours am: 8af9ea6b -s ours

am skip reason: Change-Id Iba4b121a4ddf3f04252aa0355e0e6494a593682a with SHA-1 6151c227 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1597453

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I728dab3d67cdffaee86e3847e956a391d6834c8d