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 am: b304704a

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



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