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

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



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