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

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



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