Merge "Made TaskViewTransitions less rigid" into udc-dev am: ad325995 am: 84c22aa2

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



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