Merge "[automerger skipped] Merge "libsnapshot: fix incorrect assumption of cow images" into rvc-dev am: 8601d372 am: fca9e4c3 am: fc278457 -s ours" into rvc-qpr-dev-plus-aosp am: a90d0a56 -s ours

am skip reason: Change-Id I1ec39744480e514ae7a7902643ed863e0ca0a340 with SHA-1 82035d6b is in history

Change-Id: I37bed92e1269701b0ee2dd2579168198f074f0ce