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

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



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