Revert "[DO NOT MERGE]"

This reverts commit d0823a77da.

Reason for revert: Broke the build: b/195683319

Change-Id: I931793f37df2ddcd6e179f5cc205e1bcec244de9

AndroidManifest.xml

@@ -20,7 +20,7 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.launcher3">
-    <uses-sdk android:targetSdkVersion="30" android:minSdkVersion="26"/>
+    <uses-sdk android:targetSdkVersion="29" android:minSdkVersion="25"/>
     <!--
     Manifest entries specific to Launcher3. This is merged with AndroidManifest-common.xml.
     Refer comments around specific entries on how to extend individual components.

build.gradle

@@ -22,7 +22,7 @@ android {
 
     defaultConfig {
         minSdkVersion 25
-        targetSdkVersion 30
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"