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

Change-Id: I91a18dbef23d4f3a4b0c068e61e9a236ecae877f