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: aba40fab am: 2a3018ad

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



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