Merge sc-dev-plus-aosp-without-vendor@7634622

Merged-In: I0e9307b76dfe9e0b9b5f1ad20ab52e84cc5f1b8b
Change-Id: Ib84685c96ac6b9448656882a2ad963b7248f3804
diff --git a/Android.bp b/Android.bp
index 00a2f1b..4045030 100644
--- a/Android.bp
+++ b/Android.bp
@@ -48,6 +48,7 @@
 cc_library {
     name: "marisa-trie",
     sdk_version: "current",
+    min_sdk_version: "30",
     cflags: [
         "-Werror",
         "-Wall",