Merge "Correct the pair-to-pair transition animation" into udc-dev am: 2cb51370

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



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