Merge changes from topic "androidx_drop-sc-dev-plus-aosp" into sc-dev-plus-aosp am: af52aea9a3 am: 9b17656ba1

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15689632

Change-Id: I52e46ed8fcc9a47ad97da077ada959a719055ba4

quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java

@@ -42,6 +42,7 @@ import com.android.quickstep.views.RecentsView;
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -212,6 +213,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
     }
 
     @Test
+    @Ignore("b/197802324")
     @PortraitLandscape
     public void testAllAppsFromHome() throws Exception {
         // Test opening all apps

tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java

@@ -250,6 +250,7 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest {
     }
 
     @Test
+    @Ignore("b/197802324")
     @PortraitLandscape
     public void testWidgets() throws Exception {
         // Test opening widgets.