Limit multi-display test to P+ and fix a typo

- Limit test to P+ as it fails on O for unknown reason.
- Fix the typo in tab persistence policy

Bug: 1081912
Change-Id: I9e8b9203dfac4fb359c9e9b4d337323950dc9324
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2202508Reviewed-by: Theresa  <twellington@chromium.org>
Commit-Queue: Lijin Shen <lazzzis@google.com>
Cr-Commit-Position: refs/heads/master@{#769061}

chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabbedModeTabPersistencePolicy.java

@@ -61,7 +61,7 @@ public class TabbedModeTabPersistencePolicy implements TabPersistencePolicy {
      */
     private static final Object CLEAN_UP_TASK_LOCK = new Object();
     /** Tracks whether tabs from two TabPersistentStores tabs are being merged together. */
-    // TODO(crbug.com/2139709): Transit AtomicBoolean to an AtomicInteger to keep track the task id
+    // TODO(crbug.com/1082936): Transit AtomicBoolean to an AtomicInteger to keep track the task id
     //        of activity being merged.
     private static final AtomicBoolean MERGE_IN_PROGRESS = new AtomicBoolean();
 

chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabModelMergingTest.java

@@ -517,7 +517,7 @@ public class TabModelMergingTest {
     @Test
     @LargeTest
     @EnableFeatures(ChromeFeatureList.ANDROID_MULTIPLE_DISPLAY)
-    @DisableIf.Build(sdk_is_less_than = VERSION_CODES.O)
+    @DisableIf.Build(sdk_is_less_than = VERSION_CODES.P)
     public void testMergeOnMultiDisplay_CTA_Resumed_CTA2_Not_Resumed() throws TimeoutException {
         TestThreadUtils.runOnUiThreadBlocking(() -> {
             mActivity1.saveState();