Merge SP1A.210616.001

Change-Id: I44011c7e2034bbecd208d07e917bbc7ed5b83859
diff --git a/Android.bp b/Android.bp
index 76ee467..0d71a1a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -105,6 +105,7 @@
         // See http://b/119021844 for more details.
         "--subtract-api $(location :frameworks-base-api-current.txt)",
     ],
+    dist_group: "android",
 }
 
 // Make the current.txt available for use by the cts/tests/signature tests.