Merge "libsnapshot: v3 structural changes" into main am: a4af286e am: 0043447e

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2933914



Change-Id: Ib1902139244873611090a0296e8e4cb4f4b64199
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>