[automerger skipped] Merge "Run transition when app dies in freeform" into...

[automerger skipped] Merge "Run transition when app dies in freeform" into tm-qpr-dev-plus-aosp am: ca0ff37d -s ours am: 46093f30 -s ours am: 2a75b38c -s ours

am skip reason: Merged-In I07bdadd81f6992445b11e21dc08a68c231e8d5b8 with SHA-1 cefc4aa8 is already in history

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



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