Snap for 8426163 from de9878e3b12f11d41ae97ee16c62ac7dcbb8e69f to mainline-tzdata2-release

Change-Id: I6ac960853de6895932394003d57abf5330eb93b1
diff --git a/METADATA b/METADATA
index 12eea40..100de17 100644
--- a/METADATA
+++ b/METADATA
@@ -12,6 +12,5 @@
     value: "https://bitbucket.org/stoneleaf/enum34/src/default/"
   }
   version: "1.1.6"
-  license_type: NOTICE
   last_upgrade_date { year: 2019 month: 5 day: 2 }
 }
diff --git a/NOTICE b/NOTICE
new file mode 120000
index 0000000..f1ed04c
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1 @@
+./LICENSE
\ No newline at end of file
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..61a80b2
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,8 @@
+{
+  "presubmit" : [
+    {
+      "name" : "acloud_test",
+      "host" : true
+    }
+  ]
+}
diff --git a/enum/Android.bp b/enum/Android.bp
index 95daf3f..e884f85 100644
--- a/enum/Android.bp
+++ b/enum/Android.bp
@@ -12,23 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package {
-    default_applicable_licenses: ["external_python_enum34_enum_license"],
-}
-
-// Added automatically by a large-scale-change
-// See: http://go/android-license-faq
-license {
-    name: "external_python_enum34_enum_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-BSD",
-    ],
-    license_text: [
-        "LICENSE",
-    ],
-}
-
 python_library {
     name: "py-enum34",
     host_supported: true,