Merge "Package vts kernel tests in general-tests.zip" am: 52cf004a am: 658d2a7c

Original change: https://android-review.googlesource.com/c/platform/build/+/2062947



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