[automerger skipped] Merge "Replace ConnectivityManager hidden symbols on SettingsLib" am: 56b1b24940 am: cf996f7f88 am: a8ebd89cdb -s ours
am skip reason: skipped by user reminv Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1601533 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I419b627cb3e6f0dd52740ec004496bccbaab64d2
This commit is contained in: