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 am: eefa04e7 am: 8dc90d52

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



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