Merge "Clearkey plugin didn't handle negative test cases" into oc-dev
am: 565a0ed7f8

Change-Id: I4833af56de6da7a800215064534c9a9a8b428978