Update robolectric Q stubs to final and add R

Update the Q build to use the final stubs and make the in-development
version R.  This will allow using $(PLATFORM_VERSION_CODENAME) to find
the current stubs.

Bug: 136679333
Test: m checkbuild
Change-Id: I3b9b15be281a102ee982628b6a170a6e37c2c7bb
Merged-In: I3b9b15be281a102ee982628b6a170a6e37c2c7bb
diff --git a/robolectric/src/main/java/org/robolectric/internal/SdkConfig.java b/robolectric/src/main/java/org/robolectric/internal/SdkConfig.java
index 7002140..99ef10a 100644
--- a/robolectric/src/main/java/org/robolectric/internal/SdkConfig.java
+++ b/robolectric/src/main/java/org/robolectric/internal/SdkConfig.java
@@ -29,8 +29,9 @@
               addSdk(Build.VERSION_CODES.O, "8.0.0_r4", "r1", "REL");
               addSdk(Build.VERSION_CODES.O_MR1, "8.1.0", "4611349", "REL");
               addSdk(Build.VERSION_CODES.P, "9", "4913185-2", "REL");
+              addSdk(Build.VERSION_CODES.Q, "10", "5803371", "REL");
               // BEGIN-INTERNAL
-              addSdk(Build.VERSION_CODES.Q, "Q", "r0", "Q");
+              addSdk(Build.VERSION_CODES.R, "R", "r0", "R");
               // END-INTERNAL
             }
 
diff --git a/run_robotests.mk b/run_robotests.mk
index 67a7948..8e70760 100644
--- a/run_robotests.mk
+++ b/run_robotests.mk
@@ -132,7 +132,8 @@
       $(android_all_lib_path)/android-all-8.0.0_r4-robolectric-r1.jar:$(my_robolectric_path)/android-all-8.0.0_r4-robolectric-r1.jar \
       $(android_all_lib_path)/android-all-8.1.0-robolectric-4611349.jar:$(my_robolectric_path)/android-all-8.1.0-robolectric-4611349.jar \
       $(android_all_lib_path)/android-all-9-robolectric-4913185-2.jar:$(my_robolectric_path)/android-all-9-robolectric-4913185-2.jar \
-      $(local_android_all_source_jar):$(my_robolectric_path)/android-all-Q-robolectric-r0.jar
+      $(android_all_lib_path)/android-all-10-robolectric-5803371.jar:$(my_robolectric_path)/android-all-10-robolectric-5803371.jar \
+      $(local_android_all_source_jar):$(my_robolectric_path)/android-all-R-robolectric-r0.jar
     copy_android_all_jars := $(call copy-many-files, $(copy_android_all_jar_pairs))
 
     $(my_target): $(copy_android_all_jars)