[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 am: 0c50e33c -s ours am: bb5fd995 -s ours am: a5ad6e30 -s ours am: d192c534 -s ours

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

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



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