Merge "Add api check to guard AnimatorSet behavior change" into nyc-dev