Rework thumbnail cleanup

Bug: 63766886
Test: ran CTS tests
Change-Id: I1f92bb014e275eafe3f42aef1f8c817f187c6608
Merged-In: I1f92bb014e275eafe3f42aef1f8c817f187c6608
(cherry picked from commit 0dc23f95a1bd7262909d2534c2d77ea0e73d5957)
3 files changed