Snap for 7302914 from a7ba2de9b4e89967dca0decbc3110ec974176cfd to sc-release

Change-Id: Iaa678b0d8cc232d06d287fda4adfba09ef751e1f
diff --git a/Android.mk b/Android.mk
index 55ac696..b2cd0b9 100644
--- a/Android.mk
+++ b/Android.mk
@@ -67,6 +67,8 @@
 endif
 
 LOCAL_PACKAGE_NAME := messaging
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-MIT
+LOCAL_LICENSE_CONDITIONS := notice
 
 LOCAL_CERTIFICATE := platform
 
diff --git a/tests/Android.mk b/tests/Android.mk
index aaff57a..0c93ea8 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -21,6 +21,8 @@
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_PACKAGE_NAME := messagingtests
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
 
 LOCAL_INSTRUMENTATION_FOR := messaging