Merge "Allow clearkey tests to run if no vendor modules" into oreo-vts-dev
am: d5c6411aeb  -s ours

Change-Id: Ia8f537e7c016e761737d0203476c50ed35368b13