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

Merge "Correct the pair-to-pair transition animation" into udc-dev am: 2cb51370 am: de7f02af am: 205eef01 am: 1bb9b259

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



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