[automerger skipped] Merge "Persist destroyed staged sessions until they are...

[automerger skipped] Merge "Persist destroyed staged sessions until they are cleaned up" into qt-dev am: 30348d5c am: ca4faab2 -s ours am: 18651732 -s ours am: 1e04a9ca -s ours

am skip reason: Merged-In I4ede6b7a4b5d861e5c73f13884c7aa86cf7633a2 with SHA-1 731bd965 is already in history

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

Change-Id: Iba43c8d7da08b470da6a5a07483407654ba9b624