Merge changes from topic "am-7522afcd28c74be19f6c2f79cfc8ce2e" into rvc-qpr-dev-plus-aosp
* changes:
Merge changes from topic "abandon-race" into rvc-dev am: 6b58f8ca am: 86707820 am: 867305a0
Persist destroyed staged sessions until they are cleaned up am: 731bd965 am: 8d6a58a0 am: 4a95bef9