Avoid conflict of self-overlapping ops am: 4796ea84c1 am: 38dff45483 am: 270da0e4b6

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

Change-Id: I38ed4d5a7f5559d90b2ed6da763028bdf603634c