Prevent merging transitions if we don't handle it

- If we don't handle merging the transition, it will play sequentially
  after the current transition (see ag/26641113)

Bug: 330821548
Test: N/a
Change-Id: I7d35cc173d8ced8ba9b9df02dd8a571ca08e9de7
2 files changed