tree df04a602c39bcd7540a577086dd9df8f28a0ccf6
parent 1f12dd7bba77841f4f7013ee1443a7577946dac3
parent b9295c7de0327966fd4ccbcb061e8318c3d2c882
author Alexandru-andrei Rotaru <rotaru@google.com> 1501773551 +0000
committer android-build-merger <android-build-merger@google.com> 1501773551 +0000

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

Change-Id: I86c4d74187f71a91c4532d055e5e28858ee208ca