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

Change-Id: I03d1d03f4e4e1b1dfcf68da3aa21913506739619