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

Change-Id: If94c39f3381e0e0896ce588e4cdd91ceb2fb0915