Merge "Work around android.view.animation.Animation bug prior to N" into nyc-support-25.4-dev