Merge "Migrate Tethering#dump to use runWithScissorsForDump" into main