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

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

Change-Id: I802de16bb91e13142ac70745d2efdf7f4bff8cab