Merge Android 12

Bug: 202323961
Merged-In: I408bfd18ce590466517900973893247b7c9c09fc
Change-Id: I7bf25cca10d2ce62047bf16810c17fab669a9652
diff --git a/Android.bp b/Android.bp
index ca6c4a4..a93470f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -57,3 +57,8 @@
     name: "DancingScript-Bold.ttf",
     src: "DancingScript-Bold.ttf",
 }
+
+filegroup {
+    name: "GoogleFontDancingScript",
+    srcs: [ "*.ttf" ],
+}
\ No newline at end of file