Merge "Mark SurfaceAnimationRunnerTest & AnimatingActivityRegistryTest as flaky"