Add CleanupPreviousUpdate in a few missing places am: 70a90f5cd2

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

Change-Id: I157646d12997bfa24711a40c80005657b742c7de