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

Change-Id: I0ed1fbe1e3430ea6132102ce0d6d347b5542e303