Merge "Close tethering when UI entitlement fails" am: c3b3a5fa2e am: fed8661b68
am: 525412b9de

Change-Id: I432e6e2267a87503bc7d431ef268477cc07de3da