Merge "Merge "Skip intermediate resizing when running swipe-pip transition" into udc-d1-dev am: 2a405d9c am: eb277dab" into udc-qpr-dev-plus-aosp am: 3bafd517

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



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