Merge "Notify the user and turn off tethering when the service is disallowed."...
Merge "Notify the user and turn off tethering when the service is disallowed." am: 5027dd10 -s ours am: 54c1b9e9
am: 1f12dd7b
Change-Id: I0ed1fbe1e3430ea6132102ce0d6d347b5542e303