Snap for 7302914 from 94388cfc18059ff12456a89f07f2546917f4914d to sc-d1-release

Change-Id: I920e9be866be3e0f2363dd2b5855056c44ef27d9
diff --git a/Android.mk b/Android.mk
index cebce76..509fbd4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -35,6 +35,8 @@
 LOCAL_USE_AAPT2 := true
 
 LOCAL_PACKAGE_NAME := Camera2
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
 
 LOCAL_SDK_VERSION := current
 
diff --git a/tests/Android.mk b/tests/Android.mk
index 3d8a8b7..829e17c 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -10,6 +10,8 @@
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_PACKAGE_NAME := Camera2Tests
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
 
 LOCAL_INSTRUMENTATION_FOR := Camera2