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