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

Change-Id: Ia4e02d723ae3d2305433f7f1e55f13d018e0ab89