Merge "Update API usage for mergable transitions" into sc-dev am: b99105b92f am: fc2d4538b1

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14255852

Change-Id: Iee24b62bf602032d14fdb395315a65a97e5321de