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

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



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