Merge "Set the tether Entitlement app as active when enabling tethering." into...
Merge "Set the tether Entitlement app as active when enabling tethering." into nyc-mr1-dev am: 84101bef am: 045d8f23
am: 2be1c4a0
Change-Id: If6b826a6f71ab201f83e2ff972ca91579b97738e