Merge "Disable flaky test" into udc-qpr-dev am: 99ceca8760 am: 73b3a05230

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

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

tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/open/OpenTrampolineActivityTest.kt

@@ -16,6 +16,7 @@
 
 package com.android.server.wm.flicker.activityembedding
 
+import android.platform.test.annotations.FlakyTest
 import android.platform.test.annotations.Presubmit
 import android.tools.common.datatypes.Rect
 import android.tools.common.flicker.subject.region.RegionSubject
@@ -161,6 +162,7 @@ class OpenTrampolineActivityTest(flicker: LegacyFlickerTest) : ActivityEmbedding
         }
     }
 
+    @FlakyTest(bugId = 290736037)
     /** Main activity should go from fullscreen to being a split with secondary activity. */
     @Presubmit
     @Test