Merge "Refactor PointerChoreographerTest to use Mock Policy" into main