Merge "Set min_sdk_version" into tm-dev-plus-aosp am: aeba7f5e8f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19083772

Change-Id: Ic3664ef5279df1dd07b3124fb9e72f1f65412ee1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Android.bp

@@ -305,6 +305,7 @@ java_defaults {
         "contacts-provider-platform-compat-config",
     ],
     libs: [
+        "androidx.annotation_annotation",
         "app-compat-annotations",
         "ext",
         "framework-updatable-stubs-module_libs_api",

libs/protoutil/Android.bp

@@ -55,6 +55,7 @@ cc_library {
 
     export_include_dirs: ["include"],
 
+    min_sdk_version: "30",
     apex_available: [
         "//apex_available:platform",
         "com.android.os.statsd",
@@ -81,5 +82,5 @@ cc_test {
 
     proto: {
         type: "full",
-    }
+    },
 }