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
Change-Id: Ia31a3d18c1e43c7e1ae78bdfb535af5f3273f98d