Merge changes from topic "am-0ad8adb1dc8c44d59b61ead3e8f893f3"

* changes:
  [automerger skipped] Merge "Follow up Androidx dynamic animation api change" into tm-dev am: 5cc20aa2 -s ours am: 392a254e -s ours am: 7fa94a6b -s ours am: bb936f21 -s ours
  [automerger skipped] Follow up Androidx dynamic animation api change am: 6fb25809 -s ours am: 0f70cf21 -s ours am: d7085710 -s ours am: f64624af -s ours