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

Change-Id: I3132c0ae24ee4175b3c5283ce68add22af0fb90e