Snap for 7240964 from c768eebe89d3a1ae2f89586430c945dfc0f9095b to sc-d1-release

Change-Id: I5c31d88a9d9e1fe4c5e166dbe7a20819691a468a
diff --git a/Android.mk b/Android.mk
index 3cfe5e3..7ca307c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -33,6 +33,9 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libarmnn
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD SPDX-license-identifier-BSL-1.0 SPDX-license-identifier-MIT SPDX-license-identifier-PSF-2.0 legacy_unencumbered
+LOCAL_LICENSE_CONDITIONS := notice unencumbered
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/LICENSE
 Q_OR_LATER := 1
 CPP_VERSION := c++17
 ifeq ($(Q_OR_LATER),1)
@@ -288,6 +291,9 @@
 ifeq ($(BUILD_TESTS),1)
 
 LOCAL_MODULE := armnn-tests
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD SPDX-license-identifier-BSL-1.0 SPDX-license-identifier-MIT SPDX-license-identifier-PSF-2.0 legacy_unencumbered
+LOCAL_LICENSE_CONDITIONS := notice unencumbered
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/LICENSE
 ifeq ($(Q_OR_LATER),1)
 # "eng" is deprecated in Android Q
 LOCAL_MODULE_TAGS := optional