Merge "Notify the user and turn off tethering when the service is disallowed."
am: e8b557bc08  -s ours

Change-Id: I2a1805375252b56209ac9d18da0f1771f5b6187b