[automerger skipped] Merge "Replace ConnectivityManager as TetheringManager"...

[automerger skipped] Merge "Replace ConnectivityManager as TetheringManager" am: 40643684 am: ba4af702 -s ours am: f6c40225 -s ours

am skip reason: Change-Id Id969f29d7210f2ee32719c76439049bbc86cd4f6 with SHA-1 17feecff is in history

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

Change-Id: I68d06a70f2fe19be55e8dc4f02174d65987334a2