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

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



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