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

Change-Id: I871db5c642e66094faac1f8c18ffc58a7ac57f3e