[automerger skipped] Merge "boot: Relax getSnapshotMergeStatus test." into rvc-dev am: e67a810c -s ours
am skip reason: Change-Id Ibcb9f18f535cdcb5aae7e2c9c01e03681dbfff13 with SHA-1 f0fbfdd1 is in history
Change-Id: I9bbd512622e8832aa91551dae8706eb938af8846