Merge 5cbac4f4fb35eaa4617d46c2f799286aaf4a5ce6 on remote branch

Change-Id: I8335176c7fe65ca344b9a17d24b13e0bd97ee466
diff --git a/libflags/Android.bp b/libflags/Android.bp
index 70ebcb3..2295595 100644
--- a/libflags/Android.bp
+++ b/libflags/Android.bp
@@ -11,6 +11,11 @@
         "-Werror",
     ],
     export_include_dirs: ["include"],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.resolv",
+    ],
+    min_sdk_version: "29",
 }
 
 // Tests
@@ -23,7 +28,7 @@
         "-Wextra",
     ],
     srcs: [
-        "server_configurable_flags_test.cc"
+        "server_configurable_flags_test.cc",
     ],
     shared_libs: [
         "server_configurable_flags",
@@ -31,4 +36,4 @@
     ],
     local_include_dirs: ["."],
     test_suites: ["device-tests"],
-}
\ No newline at end of file
+}