Merge pull request #2496 from wasabeef/dev-v2-naming-for-clearkey

Clarify naming for ClearKey DRM support

demo/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java

@@ -268,7 +268,7 @@ public class SampleChooserActivity extends Activity {
         case "playready":
         case "playready":
           return C.PLAYREADY_UUID;
           return C.PLAYREADY_UUID;
         case "cenc":
         case "cenc":
-          return C.CENC_UUID;
+          return C.CLEARKEY_UUID;
         default:
         default:
           try {
           try {
             return UUID.fromString(typeString);
             return UUID.fromString(typeString);