Change keep rules targeting to match AGP changes

Author: wojtek-kalicinski

ui/kotlinx-coroutines-android/r8-test-rules.pro

@@ -3,5 +3,5 @@
 # Ensure the custom, fast service loader implementation is removed. In the case of fast service
 # loader encountering an exception it falls back to regular ServiceLoader in a way that cannot be
 # optimized out by R8.
--include resources/META-INF/com.android.tools/r8-min-1.6.0/coroutines.pro
+-include resources/META-INF/com.android.tools/r8-from-1.6.0/coroutines.pro
 -checkdiscard class kotlinx.coroutines.internal.FastServiceLoader

ui/kotlinx-coroutines-android/resources/META-INF/com.android.tools/proguard/coroutines.pro

@@ -1,5 +1,5 @@
 # When editing this file, update the following files as well:
-# - META-INF/com.android.tools/r8-max-1.5.999/coroutines.pro
+# - META-INF/com.android.tools/r8-upto-1.6.0/coroutines.pro
 # - META-INF/proguard/coroutines.pro
 
 -keep class kotlinx.coroutines.android.AndroidDispatcherFactory {*;}

ui/kotlinx-coroutines-android/resources/META-INF/com.android.tools/r8-min-1.6.0/coroutines.pro renamed to ui/kotlinx-coroutines-android/resources/META-INF/com.android.tools/r8-from-1.6.0/coroutines.pro

@@ -2,6 +2,6 @@
 
 # When editing this file, update the following files as well for AGP 3.6.0+:
 # - META-INF/com.android.tools/proguard/coroutines.pro
-# - META-INF/com.android.tools/r8-max-1.5.999/coroutines.pro
+# - META-INF/com.android.tools/r8-upto-1.6.0/coroutines.pro
 
 -keep class kotlinx.coroutines.android.AndroidDispatcherFactory {*;}

ui/kotlinx-coroutines-android/resources/META-INF/com.android.tools/r8-max-1.5.999/coroutines.pro renamed to ui/kotlinx-coroutines-android/resources/META-INF/com.android.tools/r8-upto-1.6.0/coroutines.pro

@@ -40,7 +40,7 @@ class R8ServiceLoaderOptimizationTest {
         val paths = listOf(
                 "META-INF/com.android.tools/proguard/coroutines.pro",
                 "META-INF/proguard/coroutines.pro",
-                "META-INF/com.android.tools/r8-max-1.5.999/coroutines.pro"
+                "META-INF/com.android.tools/r8-upto-1.6.0/coroutines.pro"
         )
         paths.associateWith { path ->
             val ruleSet = javaClass.classLoader.getResourceAsStream(path)!!.bufferedReader().lines().filter { line ->