[automerger skipped] Merge "Revert "Turn on vk unit tests"" into udc-dev am:...

[automerger skipped] Merge "Revert "Turn on vk unit tests"" into udc-dev am: 51e65b5a am: 9638f758 -s ours am: f7bda7be -s ours

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

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



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