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

Merge "Avoid double end on PipTransitionAnimator" into udc-dev am: 839aca67 am: 3f0adff4 am: 6c7a49db am: f3e7ab67

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



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