Merge "Close tethering when UI entitlement fails"
am: c3b3a5fa2e

Change-Id: I22ee932f2a9250f11e8bc9e27c03b86884440603