Merge "Merge "Allow clearkey tests to run if no vendor modules" into...
Merge "Merge "Allow clearkey tests to run if no vendor modules" into oreo-vts-dev am: d5c6411a -s ours am: c0e92d51 -s ours" into oc-mr1-dev
am: 3fe7a30c -s ours
Change-Id: I5c8796ca99bcaeb16cbbd65a7c0b5e7c2dd57940