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