Merge cherrypicks of ['googleplex-android-review.googlesource.com/27232121'] into 24Q2-release.

Change-Id: I9bb89816d6785adb66aa766b66f285c783a9c2f1
diff --git a/Android.bp b/Android.bp
index f9fc433..8a4196a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -100,7 +100,7 @@
         "androidx.window_window",
         "error_prone_annotations",
     ],
-    min_sdk_version: "19",
+    min_sdk_version: "21",
     sdk_version: "current",
     optimize: {
         proguard_flags_files: ["proguard.flags"],
@@ -128,7 +128,7 @@
         "androidx.window_window",
         "error_prone_annotations",
     ],
-    min_sdk_version: "19",
+    min_sdk_version: "21",
     sdk_version: "current",
     optimize: {
         proguard_flags_files: ["proguard.flags"],