[automerger skipped] Merge "Revert "Don't unnecessarily reevaluate tethering provisioning""
am: abb1562ca1  -s ours

Change-Id: I6dfb0ca5342ad1a0cad6cc02b6f96f83ae897392