Avoid conflict of self-overlapping ops am: 4796ea84c1

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

Change-Id: I695fb8af5e512773b47920ffc9847339fcf43ab5