[automerger skipped] Merge "Revert "Turn on vk unit tests"" into udc-dev am: 51e65b5aac am: fa8a56ae73 am: 436d1bef40 -s ours am: 7be36c1cd6 -s ours

am skip reason: Merged-In Ica0c461af9df771292967ed10df63b2aa6902ae3 with SHA-1 d290c36e6e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23435879

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