Merge "Deflake ChoreographerTest:InputCallbackBeforeAnimation" into main