Delete files properly when history disabled

Delete the files, then the directory

Test: turn history off, check folder on device
Bug: 137396965
Change-Id: Ic69adf6d08219cab186c131147192f5d1ea1ee91
1 file changed