Merge "Don't merge task view transitions in UnfoldTransitionHandler" into udc-dev am: 021e9f1a

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



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