[automerger] Merge "Allow clearkey tests to run if no vendor modules" into oreo-vts-dev am: d5c6411aeb  -s ours am: 6790aafb8e am: a609e5d5f2

Change-Id: I987baa26acfd11ad5c8972e4344fe82b059335a6