[Android Build] Roll androidx.core

This CL rolls:
- androidx.annotation
- androidx.arch.core
- androidx.core
- androidx.interpolator

BUG=1064277

Change-Id: Ic9db1418ba7a95719c6056aa169155f4db6fcbb9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2537932Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Peter Kotwicz <pkotwicz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#827797}

DEPS

@@ -1736,7 +1736,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/androidx_annotation_annotation',
-              'version': 'version:1.1.0-cr0',
+              'version': 'version:1.2.0-alpha01-cr0',
           },
       ],
       'condition': 'checkout_android',
@@ -1780,7 +1780,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/androidx_arch_core_core_common',
-              'version': 'version:2.1.0-cr0',
+              'version': 'version:2.2.0-SNAPSHOT-cr0',
           },
       ],
       'condition': 'checkout_android',
@@ -1857,7 +1857,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/androidx_core_core',
-              'version': 'version:1.3.1-cr0',
+              'version': 'version:1.5.0-SNAPSHOT-cr0',
           },
       ],
       'condition': 'checkout_android',
@@ -1956,7 +1956,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/androidx_interpolator_interpolator',
-              'version': 'version:1.0.0-cr0',
+              'version': 'version:1.1.0-SNAPSHOT-cr0',
           },
       ],
       'condition': 'checkout_android',

chrome/android/junit/src/org/chromium/chrome/browser/omnibox/suggestions/header/HeaderViewBinderUnitTest.java

@@ -13,6 +13,7 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import android.app.Activity;
+import android.os.Bundle;
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction;
 import android.widget.ImageView;
@@ -123,6 +124,8 @@ public class HeaderViewBinderUnitTest {
     @Test
     public void actionIcon_accessibilityAnnouncementsReflectExpandedState() {
         final AccessibilityNodeInfo info = mock(AccessibilityNodeInfo.class);
+        Bundle infoExtras = new Bundle();
+        when(info.getExtras()).thenReturn(infoExtras);
 
         // Expand.
         mModel.set(HeaderViewProperties.IS_COLLAPSED, false);
@@ -131,6 +134,7 @@ public class HeaderViewBinderUnitTest {
         verify(info, never()).addAction(AccessibilityAction.ACTION_EXPAND);
 
         reset(info);
+        when(info.getExtras()).thenReturn(infoExtras);
 
         // Collapse.
         mModel.set(HeaderViewProperties.IS_COLLAPSED, true);

third_party/android_deps/BUILD.gn

@@ -167,7 +167,7 @@ android_aar_prebuilt("androidx_activity_activity_java") {
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("androidx_annotation_annotation_java") {
-  jar_path = "libs/androidx_annotation_annotation/annotation-1.1.0.jar"
+  jar_path = "libs/androidx_annotation_annotation/annotation-1.2.0-alpha01.jar"
   output_name = "androidx_annotation_annotation"
   supports_android = true
 
@@ -215,7 +215,8 @@ android_aar_prebuilt("androidx_appcompat_appcompat_resources_java") {
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("androidx_arch_core_core_common_java") {
-  jar_path = "libs/androidx_arch_core_core_common/core-common-2.1.0.jar"
+  jar_path =
+      "libs/androidx_arch_core_core_common/core-common-2.2.0-SNAPSHOT.jar"
   output_name = "androidx_arch_core_core_common"
   supports_android = true
   deps = [ ":androidx_annotation_annotation_java" ]
@@ -280,7 +281,7 @@ android_aar_prebuilt("androidx_coordinatorlayout_coordinatorlayout_java") {
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 android_aar_prebuilt("androidx_core_core_java") {
-  aar_path = "libs/androidx_core_core/core-1.3.1.aar"
+  aar_path = "libs/androidx_core_core/core-1.5.0-SNAPSHOT.aar"
   info_path = "libs/androidx_core_core/androidx_core_core.info"
   deps = [
     ":androidx_annotation_annotation_java",
@@ -389,7 +390,8 @@ android_aar_prebuilt("androidx_gridlayout_gridlayout_java") {
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 android_aar_prebuilt("androidx_interpolator_interpolator_java") {
-  aar_path = "libs/androidx_interpolator_interpolator/interpolator-1.0.0.aar"
+  aar_path =
+      "libs/androidx_interpolator_interpolator/interpolator-1.1.0-SNAPSHOT.aar"
   info_path = "libs/androidx_interpolator_interpolator/androidx_interpolator_interpolator.info"
   deps = [ ":androidx_annotation_annotation_java" ]
   resource_overlay = true

third_party/android_deps/build.gradle

@@ -23,7 +23,7 @@ repositories {
         url 'https://maven.google.com'
     }
     maven {
-        url 'https://androidx.dev/snapshots/builds/6894841/artifacts/repository'
+        url 'https://androidx.dev/snapshots/builds/6971028/artifacts/repository'
     }
 }
 
@@ -52,10 +52,10 @@ dependencies {
 
     // Support v4 libraries
     def androidXSupportLibVersion = '1.0.0'
-    compile "androidx.core:core:1.1.0"
+    compile "androidx.core:core:1.5.0-SNAPSHOT"
     compile "androidx.core:core-animation:1.0.0-SNAPSHOT"
     compile "androidx.activity:activity:1.1.0"
-    compile "androidx.annotation:annotation:1.1.0"
+    compile "androidx.annotation:annotation:1.2.0-SNAPSHOT"
     compile "androidx.appcompat:appcompat:1.2.0-beta01"
     compile "androidx.appcompat:appcompat-resources:1.2.0-beta01"
     compile "androidx.asynclayoutinflater:asynclayoutinflater:1.1.0-SNAPSHOT"
@@ -67,7 +67,7 @@ dependencies {
     compile "androidx.drawerlayout:drawerlayout:${androidXSupportLibVersion}"
     compile "androidx.fragment:fragment:1.2.5"
     compile "androidx.gridlayout:gridlayout:${androidXSupportLibVersion}"
-    compile "androidx.interpolator:interpolator:${androidXSupportLibVersion}"
+    compile "androidx.interpolator:interpolator:1.1.0-SNAPSHOT"
     compile "androidx.leanback:leanback:${androidXSupportLibVersion}"
     compile "androidx.leanback:leanback-preference:${androidXSupportLibVersion}"
     compile "androidx.localbroadcastmanager:localbroadcastmanager:1.1.0-SNAPSHOT"
@@ -87,9 +87,8 @@ dependencies {
     compile "androidx.exifinterface:exifinterface:1.4.0-SNAPSHOT"
 
     // Those are for use by doubledown libraries.
-    compile "androidx.arch.core:core-common:2.1.0"
+    compile "androidx.arch.core:core-common:2.2.0-SNAPSHOT"
     compile "androidx.annotation:annotation-experimental:1.1.0-SNAPSHOT"
-    compile "androidx.annotation:annotation:${androidXSupportLibVersion}"
     compile "androidx.legacy:legacy-support-core-utils:1.0.0"
     compile "androidx.lifecycle:lifecycle-runtime:${androidXSupportLibVersion}"
     compile "androidx.transition:transition:1.4.0-SNAPSHOT"

third_party/android_deps/libs/androidx_annotation_annotation/README.chromium

 Name: Android Support Library Annotations
 Short Name: annotation
-URL: http://developer.android.com/tools/extras/support-library.html
-Version: 1.1.0
+URL: https://developer.android.com/jetpack/androidx
+Version: 1.2.0-alpha01
 License: Apache Version 2.0
 License File: LICENSE
 Security Critical: yes

third_party/android_deps/libs/androidx_annotation_annotation/cipd.yaml

@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 # To create CIPD package run the following command.
-# cipd create --pkg-def cipd.yaml -tag version:1.1.0-cr0
+# cipd create --pkg-def cipd.yaml -tag version:1.2.0-alpha01-cr0
 package: chromium/third_party/android_deps/libs/androidx_annotation_annotation
 description: "Android Support Library Annotations"
 data:
-- file: annotation-1.1.0.jar
+- file: annotation-1.2.0-alpha01.jar

third_party/android_deps/libs/androidx_arch_core_core_common/README.chromium

 Name: Android Arch-Common
 Short Name: core-common
-URL: https://developer.android.com/topic/libraries/architecture/index.html
-Version: 2.1.0
+URL: https://developer.android.com/jetpack/androidx/releases/arch-core#2.2.0-SNAPSHOT
+Version: 2.2.0-SNAPSHOT
 License: Apache Version 2.0
 License File: LICENSE
 Security Critical: yes

third_party/android_deps/libs/androidx_arch_core_core_common/cipd.yaml

@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 # To create CIPD package run the following command.
-# cipd create --pkg-def cipd.yaml -tag version:2.1.0-cr0
+# cipd create --pkg-def cipd.yaml -tag version:2.2.0-SNAPSHOT-cr0
 package: chromium/third_party/android_deps/libs/androidx_arch_core_core_common
 description: "Android Arch-Common"
 data:
-- file: core-common-2.1.0.jar
+- file: core-common-2.2.0-SNAPSHOT.jar

third_party/android_deps/libs/androidx_core_core/README.chromium

 Name: Android Support Library compat
 Short Name: core
-URL: https://developer.android.com/jetpack/androidx
-Version: 1.3.1
+URL: https://developer.android.com/jetpack/androidx/releases/core#1.5.0-SNAPSHOT
+Version: 1.5.0-SNAPSHOT
 License: Apache Version 2.0
 License File: LICENSE
 Security Critical: yes

third_party/android_deps/libs/androidx_core_core/cipd.yaml

@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 # To create CIPD package run the following command.
-# cipd create --pkg-def cipd.yaml -tag version:1.3.1-cr0
+# cipd create --pkg-def cipd.yaml -tag version:1.5.0-SNAPSHOT-cr0
 package: chromium/third_party/android_deps/libs/androidx_core_core
 description: "Android Support Library compat"
 data:
-- file: core-1.3.1.aar
+- file: core-1.5.0-SNAPSHOT.aar

third_party/android_deps/libs/androidx_interpolator_interpolator/README.chromium

 Name: Android Support Library Interpolators
 Short Name: interpolator
-URL: http://developer.android.com/tools/extras/support-library.html
-Version: 1.0.0
+URL: https://developer.android.com/jetpack/androidx/releases/interpolator#1.1.0-SNAPSHOT
+Version: 1.1.0-SNAPSHOT
 License: Apache Version 2.0
 License File: LICENSE
 Security Critical: yes

third_party/android_deps/libs/androidx_interpolator_interpolator/cipd.yaml

@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 # To create CIPD package run the following command.
-# cipd create --pkg-def cipd.yaml -tag version:1.0.0-cr0
+# cipd create --pkg-def cipd.yaml -tag version:1.1.0-SNAPSHOT-cr0
 package: chromium/third_party/android_deps/libs/androidx_interpolator_interpolator
 description: "Android Support Library Interpolators"
 data:
-- file: interpolator-1.0.0.aar
+- file: interpolator-1.1.0-SNAPSHOT.aar