Snap for 7803083 from 3dcb38d6ce18598b5b4329623d617ab762214a47 to mainline-tzdata2-release

Change-Id: Ica57d675acd7e6c4868d74e1d4c53d8c3c0b11b5
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..cc59bba
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,31 @@
+//
+// Copyright (C) 2021 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package {
+    default_applicable_licenses: ["external_opencensus-java_license"],
+}
+
+// Added automatically by a large-scale-change
+// See: http://go/android-license-faq
+license {
+    name: "external_opencensus-java_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+    ],
+    license_text: [
+        "LICENSE",
+    ],
+}
diff --git a/api/Android.bp b/api/Android.bp
index 003a4de..537d969 100644
--- a/api/Android.bp
+++ b/api/Android.bp
@@ -14,18 +14,29 @@
 //
 //
 
-java_library_host {
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_opencensus-java_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["external_opencensus-java_license"],
+}
+
+java_library {
     name: "opencensus-java-api",
+    host_supported: true,
     srcs: [
         "src/main/java/**/*.java",
     ],
     plugins: [
-        "dagger2-auto-value",
+        "auto_value_plugin",
     ],
     libs: [
         "error_prone_annotations",
-        "dagger2-auto-value",
+        "auto_value_annotations",
         "grpc-java-context",
         "jsr305",
     ],
+    sdk_version: "current",
 }
diff --git a/contrib/grpc_metrics/Android.bp b/contrib/grpc_metrics/Android.bp
index 9d04518..8770bd6 100644
--- a/contrib/grpc_metrics/Android.bp
+++ b/contrib/grpc_metrics/Android.bp
@@ -14,8 +14,18 @@
 //
 //
 
-java_library_host {
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_opencensus-java_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["external_opencensus-java_license"],
+}
+
+java_library {
     name: "opencensus-java-contrib-grpc-metrics",
+    host_supported: true,
     srcs: [
         "src/main/java/**/*.java",
     ],
@@ -23,4 +33,5 @@
         "opencensus-java-api",
         "guava",
     ],
+    sdk_version: "current",
 }