Merge "Restore @UnsupportedApiUsage in AnimationListener"