Merge "Notify the user and turn off tethering when the service is disallowed." am: 5027dd1026  -s ours
am: 54c1b9e936

Change-Id: I93d2bda3aacb51e1db8a03c4ebce90aeb4812506