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

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

Change-Id: I081be3904ac7b56a0f2f13d9ad12c15c2ff01a3e