Run cbc1/cbcs tests from API 25 onwards

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=168834998

playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/CommonEncryptionDrmTest.java

@@ -74,7 +74,9 @@ public final class CommonEncryptionDrmTest extends ActivityInstrumentationTestCa
   }
   }
 
 
   public void testCbc1SchemeType() {
   public void testCbc1SchemeType() {
-    if (Util.SDK_INT < 24) {
+    if (Util.SDK_INT < 25) {
+      // cbc1 support was added in API 24, but it is stable from API 25 onwards.
+      // See [internal: b/65634809].
       // Pass.
       // Pass.
       return;
       return;
     }
     }
@@ -82,7 +84,9 @@ public final class CommonEncryptionDrmTest extends ActivityInstrumentationTestCa
   }
   }
 
 
   public void testCbcsSchemeType() {
   public void testCbcsSchemeType() {
-    if (Util.SDK_INT < 24) {
+    if (Util.SDK_INT < 25) {
+      // cbcs support was added in API 24, but it is stable from API 25 onwards.
+      // See [internal: b/65634809].
       // Pass.
       // Pass.
       return;
       return;
     }
     }