Merge "Persist destroyed staged sessions until they are cleaned up" into qt-dev am: 30348d5c

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

Change-Id: I4b67d39d39b3592139235e3375edf5c408795e79