Don't merge keyguard and unfold transitions

Bug: 305711477
Test: atest UnfoldTransitionHandlerTest
Change-Id: I066217dd13e4222372f26dbed0c2510e8c4815df
2 files changed