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

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

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