Add clean up code into a flag

Bug: 329020894
Test: injecting log, seeing expected result
Change-Id: I49fac4fd6ecd7e489a49fcacb21237439ce262d9
1 file changed