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: 025fb134 am: 56978ef5 am: 4e028519

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



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