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

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



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