[automerger skipped] Merge "Persist destroyed staged sessions until they are cleaned up" into qt-dev am: 30348d5cdc am: ca4faab256 -s ours am: 18651732ad -s ours am: 1e04a9cad6 -s ours am: 696461f1a6 -s ours am: b004ef6141 -s ours am: b20b70ef90 -s ours am: 317fc3608b -s ours

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

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

Change-Id: Ib0532e5ab226ab3d1a4f997a0c747a57efd3e945