Merge "[automerger skipped] Merge "libsnapshot: Export COW image size" into...

Merge "[automerger skipped] Merge "libsnapshot: Export COW image size" into rvc-dev am: 3ec696d0 -s ours am: 4b1d97a6 -s ours" into rvc-d1-dev-plus-aosp am: 6078b152 -s ours

am skip reason: Change-Id I4faa0785f23884e26161e0d51268dd7a305d86bf with SHA-1 28983434 is in history

Change-Id: Ibaaaec140bfcfa76741cb697f7372668bed8d611