Merge "Allow clearkey tests to run if no vendor modules am: 5db2e672 am:...
Merge "Allow clearkey tests to run if no vendor modules am: 5db2e672 am: 66812dc3" into oc-dr1-dev-plus-aosp am: 9e3e5dbe
am: c5d0948a
Change-Id: Ic112bcab86894bae79978449a41bbc25fafa91f1