Merge "Avoid double end on PipTransitionAnimator" into udc-dev am: 839aca67 am: 2a93920d

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



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