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: a538a071 am: 0dcb34ff" into oc-mr1-dev-plus-aosp
am: d2c0cc2d
Change-Id: Ied7a27dfe617163f488433ec2922798dcd5d6148