Merge "Revert "Don't unnecessarily reevaluate tethering provisioning""