Rework thumbnail cleanup -- DO NOT MERGE

Bug: 63766886
Test: ran CTS tests
Change-Id: I1173f67d6fb41494d6d069cc7cfc0c2b0dcc1725
Merged-In: I1173f67d6fb41494d6d069cc7cfc0c2b0dcc1725
1 file changed