Merge "Notify the user and turn off tethering when the service is disallowed." into stage-aosp-master
am: b9295c7de0  -s ours

Change-Id: I86c4d74187f71a91c4532d055e5e28858ee208ca