[automerger skipped] Reapply "Notify the user and turn off tethering when the...
[automerger skipped] Reapply "Notify the user and turn off tethering when the service is disallowed." am: be8e056d -s ours
am: aeb9d5de -s ours
Change-Id: Icf56e27e8d0baa1fea4e34aeb986a6f13d0e9f92