Merge changes from topic "am-d3cc8345e04f4674ac385ccbf2461123" into rvc-d1-dev-plus-aosp
* changes:
Merge changes from topic "abandon-race" into rvc-dev am: 6b58f8ca am: 86707820
Persist destroyed staged sessions until they are cleaned up am: 731bd965 am: 8d6a58a0