Merge "Merge "Merge "Replace ConnectivityManager as TetheringManager" into...

Merge "Merge "Merge "Replace ConnectivityManager as TetheringManager" into rvc-dev am: 2aa2b0a2 am: 52a3551a" into rvc-d1-dev-plus-aosp am: ac3266b1" into rvc-qpr-dev-plus-aosp am: 8152e9d4

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

Change-Id: I145def075a545a397ce7e631175a5f4e9ada9330