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

Change-Id: I3bdc5ec1ae737df4df33a1d72db7935d226bb282