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

Change-Id: Ib220e702e9c6c714ff327db80cae89dc70202d4a