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

Change-Id: Ica909191e8eb48aea72603bd6f795e449603931d