Snap for 10453563 from 1be9601f7c102bd01b9f63b64195c313d49a8077 to mainline-media-release

Change-Id: Ie4459510038bed791a355daa4fb0ec586cea77b5
diff --git a/Android.bp b/Android.bp
index e8e9200..65f4c40 100644
--- a/Android.bp
+++ b/Android.bp
@@ -40,4 +40,10 @@
     srcs: [
         "src/main/**/*.java",
     ],
+
+    errorprone: {
+        javacflags: [
+            "-Xep:IdentityBinaryExpression:WARN",
+        ],
+    },
 }
diff --git a/METADATA b/METADATA
index d8c341c..4aa8fdc 100644
--- a/METADATA
+++ b/METADATA
@@ -13,6 +13,6 @@
   }
   version: "rel_3_27_0_ga"
   last_upgrade_date { year: 2020 month: 9 day: 10 }
-  // The project can be licensed under one of MPL, LGPL or AL, and Apache 2.0 is a "notice" license.
+  license_note: 'The project can be licensed under one of MPL, LGPL or AL, and Apache 2.0 is a "notice" license.'
   license_type: NOTICE
 }