Snap for 8730993 from 6406003f1eb351e367f8ef8c5e240114fc3a314f to mainline-tzdata3-release

Change-Id: Ic10cd55553abb40a57ea122d061fb5d2277b4019
diff --git a/Android.bp b/Android.bp
index 9ba26a3..604fd07 100644
--- a/Android.bp
+++ b/Android.bp
@@ -19,6 +19,7 @@
     default_applicable_licenses: ["system_ca-certificates_license"],
 }
 
+// Added automatically by a large-scale-change
 // See: http://go/android-license-faq
 license {
     name: "system_ca-certificates_license",
@@ -26,7 +27,7 @@
     license_kinds: [
         "legacy_by_exception_only", // by exception only
     ],
-    license_text: [],
+    // large-scale-change unable to identify any license_text files
 }
 
 ca_certificates {
diff --git a/METADATA b/METADATA
index b7a7487..598c1ea 100644
--- a/METADATA
+++ b/METADATA
@@ -2,7 +2,7 @@
 #     CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE
 #     DEPENDING ON IT IN YOUR PROJECT. ***
 third_party {
-  license_note: "Quo Vadis Certificate Policy in files/5cf9d536.0 references:\n"
-  "   Quo Vadis Certificate Holder Agreement"
+  # Quo Vadis Certificate Policy in files/5cf9d536.0 references:
+  #   Quo Vadis Certificate Holder Agreement
   license_type: BY_EXCEPTION_ONLY
 }