Merge "Change WTFPL and BeerWare to notice per recent change." am: c6226d668e

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1570963

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I602a7f46ae22d320888d2b891795c4cd8de4a3fe

licenses/Android.bp

@@ -307,10 +307,7 @@ license_kind {
 
 license_kind {
     name: "SPDX-license-identifier-Beerware",
-    conditions: [
-        "by_exception_only",
-        "not_allowed",
-    ],
+    conditions: ["notice"],
     url: "https://spdx.org/licenses/Beerware.html",
 }
 
@@ -1137,10 +1134,7 @@ license_kind {
 
 license_kind {
     name: "SPDX-license-identifier-WTFPL",
-    conditions: [
-        "by_exception_only",
-        "not_allowed",
-    ],
+    conditions: ["notice"],
     url: "https://spdx.org/licenses/WTFPL.html",
 }