SF: Clean up flush transaction queues

Test: presubmit
Bug: 238781169
Change-Id: Ie2298fedf66444c5b6edf5db96bad86abef63d79
3 files changed