Merge "Follow up Androidx dynamic animation api change" into tm-dev