Merge "WindowInsetsAnimation: Clean up API"