[automerger skipped] Merge "fastboot: Fix snapshot-update merge behavior." into rvc-dev am: 4adbeb47 -s ours
am skip reason: Change-Id Ief6dea3ba76323044e61307272dda320a4494aea with SHA-1 5a0177d9 is in history
Change-Id: I93453e3e12b473334b58bd7fac659ac81cd06850