Merge "Fix aborting transition when deliver to top bellow transient launch"...

Merge "Fix aborting transition when deliver to top bellow transient launch" into udc-dev am: 69e0c717

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



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