Merge "Revert "[DO NOT MERGE] WindowInsetsAnimationControllerTests: make more robust"" into android11-tests-dev