Merge "Fix AnimationLib Test not running in presubmit" into tm-qpr-dev