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

Change-Id: I6672cd7a23ee7c6b5d384fae7111be2948f59e45