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

Change-Id: I974d210170cc7e914931081df15927040a42969c