Merge cherrypicks of ['googleplex-android-review.googlesource.com/23035156', 'googleplex-android-review.googlesource.com/23046996'] into studio-giraffe-release.

Change-Id: Id701f8a2a71e7c2ca953204f27af633a69dd8857

2 files changed, 9 insertions, 1 deletions

diff --git a/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/lint/AndroidLintTask.kt b/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/lint/AndroidLintTask.kt
index 8e937680b1..f4cbe141aa 100644
--- a/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/lint/AndroidLintTask.kt
+++ b/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/lint/AndroidLintTask.kt
@@ -29,6 +29,7 @@ import com.android.build.gradle.internal.publishing.AndroidArtifacts
 import com.android.build.gradle.internal.scope.InternalArtifactType
 import com.android.build.gradle.internal.services.TaskCreationServices
 import com.android.build.gradle.internal.services.getBuildService
+import com.android.build.gradle.internal.services.getLintParallelBuildService
 import com.android.build.gradle.internal.tasks.BuildAnalyzer
 import com.android.build.gradle.internal.tasks.NonIncrementalTask
 import com.android.build.gradle.internal.tasks.factory.VariantTaskCreationAction
@@ -850,6 +851,9 @@ abstract class AndroidLintTask : NonIncrementalTask() {
         }
         systemPropertyInputs.initialize(project.providers, lintMode)
         environmentVariableInputs.initialize(project.providers, lintMode)
+        this.usesService(
+            services.buildServiceRegistry.getLintParallelBuildService(services.projectOptions)
+        )
     }
 
     fun configureForStandalone(
diff --git a/dynamic-layout-inspector/agent/appinspection/fake-android/src/android/content/res/Configuration.java b/dynamic-layout-inspector/agent/appinspection/fake-android/src/android/content/res/Configuration.java
index 8c4513cf55..31a9f4f28d 100644
--- a/dynamic-layout-inspector/agent/appinspection/fake-android/src/android/content/res/Configuration.java
+++ b/dynamic-layout-inspector/agent/appinspection/fake-android/src/android/content/res/Configuration.java
@@ -38,7 +38,11 @@ public final class Configuration {
     public int orientation = 0;
     public int screenWidthDp = 0;
     public int screenHeightDp = 0;
-    public int grammaticalGender = 0;
+    public int grammaticalGenderField = 0;
+
+    public int getGrammaticalGender() {
+        return grammaticalGenderField;
+    }
 
     public final LocaleList getLocales() {
         return mLocales;