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: 4edd427e am: 7c31bfac am: dc0ceac9

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



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