Add CleanupPreviousUpdate in a few missing places am: 70a90f5cd2 am: c5c048b7da am: 8a18b23a87 am: 0cfac4e72a

Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/1428105

Change-Id: Ic9c5e49b5239bcd2b167f940f9b80913a073fe9a