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

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

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



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