Merge "PointerChoreographerTest: Use builders to generate motion and key args" into main