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

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

Change-Id: I0f01c363d4c9afcef885d3b55449a1bf52a28899