Merge "Replace ConnectivityManager constants to TetheringManager"
am: 0728d22b39

Change-Id: I7994991ac24f4e3ce753e55976b4b5e70b31539f