[automerger skipped] Merge "Replace ConnectivityManager hidden symbols on Settings" am: cbcea32087
am: 995581e856
am: 155d4d6cd3
-s ours
am skip reason: Change-Id Iba4b121a4ddf3f04252aa0355e0e6494a593682a with SHA-1 6151c227e0
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1597453
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icdd83bd4c20e65149fd09e7364cb8f7f37946dd5
This commit is contained in: