[automerger skipped] Merge "Replace ConnectivityManager as TetheringManager" am: 4064368496
am: ba4af7020c
-s ours am: f6c4022554
-s ours
am skip reason: Change-Id Id969f29d7210f2ee32719c76439049bbc86cd4f6 with SHA-1 17feecffae
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1344637
Change-Id: I68d06a70f2fe19be55e8dc4f02174d65987334a2
This commit is contained in: