Merge "[RESTRICT AUTOMERGE] Revert "Persist destroyed staged sessions until they are cleaned up"" into qt-dev am: 650eb0cc

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



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