Merge "Refactor transition player to fix merge ordering" into udc-dev am: a695301f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21901280



Change-Id: I81d28719bf287d351197abdb749b6063617f905f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>