Merge 51ee2d606be77b4c75ec4222cc7cc26c73721fa5 on remote branch

Change-Id: Ibb36e0f7a0b9b34d3ebc65f48aa8a50a7b9ed452
diff --git a/Android.bp b/Android.bp
index 7034daf..3edd4b6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,3 +1,44 @@
+package {
+    default_applicable_licenses: ["external_grpc-grpc_license"],
+}
+
+// Added automatically by a large-scale-change that took the approach of
+// 'apply every license found to every target'. While this makes sure we respect
+// every license restriction, it may not be entirely correct.
+//
+// e.g. GPL in an MIT project might only apply to the contrib/ directory.
+//
+// Please consider splitting the single license below into multiple licenses,
+// taking care not to lose any license_kind information, and overriding the
+// default license using the 'licenses: [...]' property on targets as needed.
+//
+// For unused files, consider creating a 'fileGroup' with "//visibility:private"
+// to attach the license to, and including a comment whether the files may be
+// used in the current project.
+//
+// large-scale-change included anything that looked like it might be a license
+// text as a license_text. e.g. LICENSE, NOTICE, COPYING etc.
+//
+// Please consider removing redundant or irrelevant files from 'license_text:'.
+// See: http://go/android-license-faq
+license {
+    name: "external_grpc-grpc_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-ISC",
+        "SPDX-license-identifier-MIT",
+        "SPDX-license-identifier-MPL-2.0",
+        "SPDX-license-identifier-Zlib",
+        "legacy_unencumbered",
+    ],
+    license_text: [
+        "LICENSE",
+        "NOTICE.txt",
+    ],
+}
+
 cc_defaults {
     name: "grpc_defaults",
     cflags: [
diff --git a/test/core/util/Android.bp b/test/core/util/Android.bp
index ed87486..fff362d 100644
--- a/test/core/util/Android.bp
+++ b/test/core/util/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_grpc-grpc_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["external_grpc-grpc_license"],
+}
+
 cc_library_static {
     name: "libgpr_test_util",
     defaults: ["grpc_defaults"],
diff --git a/test/cpp/common/Android.bp b/test/cpp/common/Android.bp
index 6e118ca..2f6eb43 100644
--- a/test/cpp/common/Android.bp
+++ b/test/cpp/common/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_grpc-grpc_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["external_grpc-grpc_license"],
+}
+
 cc_test {
     name: "alarm_test",
     defaults: ["grpc_defaults"],
diff --git a/third_party/address_sorting/Android.bp b/third_party/address_sorting/Android.bp
index 767644e..1756a37 100644
--- a/third_party/address_sorting/Android.bp
+++ b/third_party/address_sorting/Android.bp
@@ -1,3 +1,22 @@
+package {
+    default_applicable_licenses: [
+        "external_grpc-grpc_third_party_address_sorting_license",
+    ],
+}
+
+// Added automatically by a large-scale-change
+// See: http://go/android-license-faq
+license {
+    name: "external_grpc-grpc_third_party_address_sorting_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-BSD",
+    ],
+    license_text: [
+        "LICENSE",
+    ],
+}
+
 cc_library_static {
     name: "libaddress_sorting",
     defaults: ["grpc_defaults"],