[automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: 1877a478f8 -s ours

am skip reason: Merged-In I318b3a3749406a4117429c2e19956cd6d196cc4a with SHA-1 cece603ee2 is already in history

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

Change-Id: I9a66c37fdd58b5dbf93d638878ae427f1fd9eb9f