Merge "Reland aosp/3144167: Migrate vts_libsnapshot_test and friends to...

Merge "Reland aosp/3144167: Migrate vts_libsnapshot_test and friends to general-tests zip" into main am: 14807185 am: 1148407c

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



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