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

Change-Id: If888f1000209f015dc097b616c64d626848d4402