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 am: 3fe7a30c97  -s ours
am: 4210a69e9c  -s ours

Change-Id: Iac5f4e23fc70a155a85c794d8ba31afd5d9debd0