Merge "Fix transition timeout when launching activity in TaskFragment" into udc-dev am: b504082e am: 03afce3d

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



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