Merge "Revert "Turn on vk unit tests"" into udc-dev am: 51e65b5a am: fa8a56ae

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



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