Merge "Use errorprone.extra_check_modules for error prone checks" into sc-dev

packages/Android.bp

@@ -24,8 +24,8 @@ package {
 
 java_defaults {
     name: "platform_app_defaults",
-    plugins: ["error_prone_android_framework"],
     errorprone: {
+        extra_check_modules: ["error_prone_android_framework"],
         javacflags: [
             // We're less worried about performance in app code
             "-Xep:AndroidFrameworkEfficientCollections:OFF",

packages/StatementService/Android.bp

@@ -22,8 +22,7 @@ package {
 
 android_app {
     name: "StatementService",
-    // Removed because Errorprone doesn't work with Kotlin, can fix up in the future
-    // defaults: ["platform_app_defaults"],
+    defaults: ["platform_app_defaults"],
     srcs: [
         "src/**/*.java",
         "src/**/*.kt",