Merge "Allow clearkey tests to run if no vendor modules am: 5db2e67293 am: 66812dc364" into oc-dr1-dev-plus-aosp