Update AndroidX preference library to v1.1.1

This also updates the preference library's dependencies:
core, annotation, collection, fragment

Binary-Size: New androidx fragment library is larger.
Bug: 1092986
Change-Id: Ifbc383b4e48c443e0cc1993e387e76270e89dac5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2238412Reviewed-by: Nico Weber <thakis@chromium.org>
Reviewed-by: Sam Maier <smaier@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Robbie McElrath <rmcelrath@chromium.org>
Cr-Commit-Position: refs/heads/master@{#780051}

DEPS

@@ -1671,7 +1671,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/androidx_activity_activity',
-              'version': 'version:1.0.0-cr0',
+              'version': 'version:1.1.0-cr0',
           },
       ],
       'condition': 'checkout_android',
@@ -1737,7 +1737,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/androidx_arch_core_core_runtime',
-              'version': 'version:2.0.0-cr0',
+              'version': 'version:2.1.0-cr0',
           },
       ],
       'condition': 'checkout_android',
@@ -1858,7 +1858,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/androidx_fragment_fragment',
-              'version': 'version:1.1.0-cr0',
+              'version': 'version:1.2.5-cr0',
           },
       ],
       'condition': 'checkout_android',
@@ -1968,7 +1968,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/androidx_lifecycle_lifecycle_common',
-              'version': 'version:2.1.0-cr0',
+              'version': 'version:2.2.0-cr0',
           },
       ],
       'condition': 'checkout_android',
@@ -2001,7 +2001,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/androidx_lifecycle_lifecycle_livedata_core',
-              'version': 'version:2.0.0-cr0',
+              'version': 'version:2.2.0-cr0',
           },
       ],
       'condition': 'checkout_android',
@@ -2012,7 +2012,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/androidx_lifecycle_lifecycle_runtime',
-              'version': 'version:2.1.0-cr0',
+              'version': 'version:2.2.0-cr0',
           },
       ],
       'condition': 'checkout_android',
@@ -2023,7 +2023,18 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/androidx_lifecycle_lifecycle_viewmodel',
-              'version': 'version:2.1.0-cr0',
+              'version': 'version:2.2.0-cr0',
+          },
+      ],
+      'condition': 'checkout_android',
+      'dep_type': 'cipd',
+  },
+
+  'src/third_party/android_deps/libs/androidx_lifecycle_lifecycle_viewmodel_savedstate': {
+      'packages': [
+          {
+              'package': 'chromium/third_party/android_deps/libs/androidx_lifecycle_lifecycle_viewmodel_savedstate',
+              'version': 'version:2.2.0-cr0',
           },
       ],
       'condition': 'checkout_android',
@@ -2100,7 +2111,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/androidx_preference_preference',
-              'version': 'version:1.0.0-cr0',
+              'version': 'version:1.1.1-cr0',
           },
       ],
       'condition': 'checkout_android',

chrome/android/java/monochrome_public_bundle.proguard_flags.expected

@@ -540,6 +540,17 @@
   <methods>;
 }
 
+################################################################################
+# obj/third_party/android_deps/androidx_lifecycle_lifecycle_viewmodel_savedstate_java/proguard.txt
+################################################################################
+-keepclassmembers,allowobfuscation class * extends androidx.lifecycle.ViewModel {
+    <init>(androidx.lifecycle.SavedStateHandle);
+}
+
+-keepclassmembers,allowobfuscation class * extends androidx.lifecycle.AndroidViewModel {
+    <init>(android.app.Application,androidx.lifecycle.SavedStateHandle);
+}
+
 ################################################################################
 # obj/third_party/android_deps/androidx_media_media_java/proguard.txt
 ################################################################################

third_party/android_deps/BUILD.gn

@@ -281,17 +281,21 @@ android_aar_prebuilt("androidx_drawerlayout_drawerlayout_java") {
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 android_aar_prebuilt("androidx_fragment_fragment_java") {
-  aar_path = "libs/androidx_fragment_fragment/fragment-1.1.0.aar"
+  aar_path = "libs/androidx_fragment_fragment/fragment-1.2.5.aar"
   info_path = "libs/androidx_fragment_fragment/androidx_fragment_fragment.info"
   deps = [
     ":androidx_activity_activity_java",
     ":androidx_annotation_annotation_java",
     ":androidx_collection_collection_java",
     ":androidx_core_core_java",
+    ":androidx_lifecycle_lifecycle_livedata_core_java",
     ":androidx_lifecycle_lifecycle_viewmodel_java",
+    ":androidx_lifecycle_lifecycle_viewmodel_savedstate_java",
     ":androidx_loader_loader_java",
     ":androidx_viewpager_viewpager_java",
   ]
+
+  ignore_proguard_configs = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -386,7 +390,7 @@ android_aar_prebuilt("androidx_legacy_legacy_support_v4_java") {
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("androidx_lifecycle_lifecycle_common_java") {
   jar_path =
-      "libs/androidx_lifecycle_lifecycle_common/lifecycle-common-2.1.0.jar"
+      "libs/androidx_lifecycle_lifecycle_common/lifecycle-common-2.2.0.jar"
   output_name = "androidx_lifecycle_lifecycle_common"
   supports_android = true
   deps = [ ":androidx_annotation_annotation_java" ]
@@ -406,7 +410,7 @@ java_prebuilt("androidx_lifecycle_lifecycle_common_java8_java") {
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 android_aar_prebuilt("androidx_lifecycle_lifecycle_runtime_java") {
   aar_path =
-      "libs/androidx_lifecycle_lifecycle_runtime/lifecycle-runtime-2.1.0.aar"
+      "libs/androidx_lifecycle_lifecycle_runtime/lifecycle-runtime-2.2.0.aar"
   info_path = "libs/androidx_lifecycle_lifecycle_runtime/androidx_lifecycle_lifecycle_runtime.info"
   deps = [
     ":androidx_annotation_annotation_java",
@@ -420,7 +424,7 @@ android_aar_prebuilt("androidx_lifecycle_lifecycle_runtime_java") {
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 android_aar_prebuilt("androidx_lifecycle_lifecycle_viewmodel_java") {
-  aar_path = "libs/androidx_lifecycle_lifecycle_viewmodel/lifecycle-viewmodel-2.1.0.aar"
+  aar_path = "libs/androidx_lifecycle_lifecycle_viewmodel/lifecycle-viewmodel-2.2.0.aar"
   info_path = "libs/androidx_lifecycle_lifecycle_viewmodel/androidx_lifecycle_lifecycle_viewmodel.info"
   deps = [ ":androidx_annotation_annotation_java" ]
 
@@ -459,10 +463,11 @@ android_aar_prebuilt("androidx_multidex_multidex_java") {
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 android_aar_prebuilt("androidx_preference_preference_java") {
-  aar_path = "libs/androidx_preference_preference/preference-1.0.0.aar"
+  aar_path = "libs/androidx_preference_preference/preference-1.1.1.aar"
   info_path =
       "libs/androidx_preference_preference/androidx_preference_preference.info"
   deps = [
+    ":androidx_annotation_annotation_java",
     ":androidx_appcompat_appcompat_java",
     ":androidx_collection_collection_java",
     ":androidx_core_core_java",
@@ -1620,7 +1625,7 @@ android_aar_prebuilt("android_arch_lifecycle_livedata_core_java") {
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 android_aar_prebuilt("androidx_activity_activity_java") {
-  aar_path = "libs/androidx_activity_activity/activity-1.0.0.aar"
+  aar_path = "libs/androidx_activity_activity/activity-1.1.0.aar"
   info_path = "libs/androidx_activity_activity/androidx_activity_activity.info"
 
   # To remove visibility constraint, add this dependency to
@@ -1631,6 +1636,7 @@ android_aar_prebuilt("androidx_activity_activity_java") {
     ":androidx_core_core_java",
     ":androidx_lifecycle_lifecycle_runtime_java",
     ":androidx_lifecycle_lifecycle_viewmodel_java",
+    ":androidx_lifecycle_lifecycle_viewmodel_savedstate_java",
     ":androidx_savedstate_savedstate_java",
   ]
 }
@@ -1659,7 +1665,7 @@ java_prebuilt("androidx_arch_core_core_common_java") {
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 android_aar_prebuilt("androidx_arch_core_core_runtime_java") {
-  aar_path = "libs/androidx_arch_core_core_runtime/core-runtime-2.0.0.aar"
+  aar_path = "libs/androidx_arch_core_core_runtime/core-runtime-2.1.0.aar"
   info_path = "libs/androidx_arch_core_core_runtime/androidx_arch_core_core_runtime.info"
 
   # To remove visibility constraint, add this dependency to
@@ -1739,7 +1745,7 @@ android_aar_prebuilt("androidx_lifecycle_lifecycle_livedata_java") {
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 android_aar_prebuilt("androidx_lifecycle_lifecycle_livedata_core_java") {
-  aar_path = "libs/androidx_lifecycle_lifecycle_livedata_core/lifecycle-livedata-core-2.0.0.aar"
+  aar_path = "libs/androidx_lifecycle_lifecycle_livedata_core/lifecycle-livedata-core-2.2.0.aar"
   info_path = "libs/androidx_lifecycle_lifecycle_livedata_core/androidx_lifecycle_lifecycle_livedata_core.info"
 
   # To remove visibility constraint, add this dependency to
@@ -1752,6 +1758,22 @@ android_aar_prebuilt("androidx_lifecycle_lifecycle_livedata_core_java") {
   ]
 }
 
+# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+android_aar_prebuilt("androidx_lifecycle_lifecycle_viewmodel_savedstate_java") {
+  aar_path = "libs/androidx_lifecycle_lifecycle_viewmodel_savedstate/lifecycle-viewmodel-savedstate-2.2.0.aar"
+  info_path = "libs/androidx_lifecycle_lifecycle_viewmodel_savedstate/androidx_lifecycle_lifecycle_viewmodel_savedstate.info"
+
+  # To remove visibility constraint, add this dependency to
+  # //third_party/android_deps/build.gradle.
+  visibility = [ ":*" ]
+  deps = [
+    ":androidx_annotation_annotation_java",
+    ":androidx_lifecycle_lifecycle_livedata_core_java",
+    ":androidx_lifecycle_lifecycle_viewmodel_java",
+    ":androidx_savedstate_savedstate_java",
+  ]
+}
+
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 android_aar_prebuilt("androidx_loader_loader_java") {
   aar_path = "libs/androidx_loader_loader/loader-1.0.0.aar"

third_party/android_deps/additional_readme_paths.json

@@ -40,6 +40,7 @@
     "libs/androidx_lifecycle_lifecycle_livedata_core",
     "libs/androidx_lifecycle_lifecycle_runtime",
     "libs/androidx_lifecycle_lifecycle_viewmodel",
+    "libs/androidx_lifecycle_lifecycle_viewmodel_savedstate",
     "libs/androidx_loader_loader",
     "libs/androidx_localbroadcastmanager_localbroadcastmanager",
     "libs/androidx_media_media",

third_party/android_deps/build.gradle

@@ -22,28 +22,28 @@ dependencies {
 
     // Support v4 libraries
     def androidXSupportLibVersion = '1.0.0'
-    compile "androidx.core:core:${androidXSupportLibVersion}"
+    compile "androidx.core:core:1.1.0"
     compile "androidx.legacy:legacy-support-core-ui:${androidXSupportLibVersion}"
     compile "androidx.legacy:legacy-support-core-utils:${androidXSupportLibVersion}"
     compile "androidx.legacy:legacy-support-v4:${androidXSupportLibVersion}"
     compile "androidx.legacy:legacy-support-v13:${androidXSupportLibVersion}"
-    compile "androidx.annotation:annotation:${androidXSupportLibVersion}"
+    compile "androidx.annotation:annotation:1.1.0"
     compile "androidx.appcompat:appcompat:1.2.0-beta01"
     compile "androidx.appcompat:appcompat-resources:1.2.0-beta01"
     compile "androidx.asynclayoutinflater:asynclayoutinflater:${androidXSupportLibVersion}"
     compile "androidx.cardview:cardview:${androidXSupportLibVersion}"
     compile "androidx.concurrent:concurrent-futures:${androidXSupportLibVersion}"
-    compile "androidx.collection:collection:${androidXSupportLibVersion}"
+    compile "androidx.collection:collection:1.1.0"
     compile "androidx.coordinatorlayout:coordinatorlayout:${androidXSupportLibVersion}"
     compile "androidx.customview:customview:${androidXSupportLibVersion}"
     compile "androidx.drawerlayout:drawerlayout:${androidXSupportLibVersion}"
-    compile "androidx.fragment:fragment:${androidXSupportLibVersion}"
+    compile "androidx.fragment:fragment:1.2.5"
     compile "androidx.gridlayout:gridlayout:${androidXSupportLibVersion}"
     compile "androidx.interpolator:interpolator:${androidXSupportLibVersion}"
     compile "androidx.leanback:leanback-preference:${androidXSupportLibVersion}"
     compile "androidx.localbroadcastmanager:localbroadcastmanager:${androidXSupportLibVersion}"
     compile "androidx.mediarouter:mediarouter:${androidXSupportLibVersion}"
-    compile "androidx.preference:preference:${androidXSupportLibVersion}"
+    compile "androidx.preference:preference:1.1.1"
     compile "androidx.recyclerview:recyclerview:${androidXSupportLibVersion}"
     compile "androidx.swiperefreshlayout:swiperefreshlayout:${androidXSupportLibVersion}"
     compile "androidx.vectordrawable:vectordrawable:${androidXSupportLibVersion}"

third_party/android_deps/buildSrc/src/main/groovy/BuildConfigGenerator.groovy

@@ -296,6 +296,10 @@ class BuildConfigGenerator extends DefaultTask {
                 sb.append('  ignore_proguard_configs = true\n')
                 sb.append('  custom_package = "androidx.core"\n')
                 break
+            case 'androidx_fragment_fragment':
+                sb.append('\n')
+                sb.append('  ignore_proguard_configs = true\n')
+                break
             case 'androidx_media_media':
             case 'androidx_versionedparcelable_versionedparcelable':
             case 'com_android_support_support_media_compat':

third_party/android_deps/libs/androidx_activity_activity/README.chromium

 Name: Activity
 Short Name: activity
 URL: https://developer.android.com/jetpack/androidx
-Version: 1.0.0
+Version: 1.1.0
 License: Apache Version 2.0
 License File: LICENSE
 Security Critical: yes

third_party/android_deps/libs/androidx_activity_activity/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-cr0
 package: chromium/third_party/android_deps/libs/androidx_activity_activity
 description: "Activity"
 data:
-- file: activity-1.0.0.aar
+- file: activity-1.1.0.aar

third_party/android_deps/libs/androidx_arch_core_core_runtime/README.chromium

 Name: Android Arch-Runtime
 Short Name: core-runtime
 URL: https://developer.android.com/topic/libraries/architecture/index.html
-Version: 2.0.0
+Version: 2.1.0
 License: Apache Version 2.0
 License File: LICENSE
 Security Critical: yes

third_party/android_deps/libs/androidx_arch_core_core_runtime/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.0.0-cr0
+# cipd create --pkg-def cipd.yaml -tag version:2.1.0-cr0
 package: chromium/third_party/android_deps/libs/androidx_arch_core_core_runtime
 description: "Android Arch-Runtime"
 data:
-- file: core-runtime-2.0.0.aar
+- file: core-runtime-2.1.0.aar

third_party/android_deps/libs/androidx_fragment_fragment/README.chromium

 Name: Android Support Library fragment
 Short Name: fragment
 URL: https://developer.android.com/jetpack/androidx
-Version: 1.1.0
+Version: 1.2.5
 License: Apache Version 2.0
 License File: LICENSE
 Security Critical: yes

third_party/android_deps/libs/androidx_fragment_fragment/androidx_fragment_fragment.info

@@ -5,9 +5,19 @@ aidl = []
 assets = []
 has_classes_jar = true
 has_native_libraries = false
-has_proguard_flags = false
+has_proguard_flags = true
 has_r_text_file = true
 is_manifest_empty = true
-resources = []
+resources = [
+  "res/anim/fragment_close_enter.xml",
+  "res/anim/fragment_close_exit.xml",
+  "res/anim/fragment_fade_enter.xml",
+  "res/anim/fragment_fade_exit.xml",
+  "res/anim/fragment_fast_out_extra_slow_in.xml",
+  "res/anim/fragment_open_enter.xml",
+  "res/anim/fragment_open_exit.xml",
+  "res/anim-v21/fragment_fast_out_extra_slow_in.xml",
+  "res/values/values.xml"
+]
 subjar_tuples = []
 subjars = []

third_party/android_deps/libs/androidx_fragment_fragment/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.5-cr0
 package: chromium/third_party/android_deps/libs/androidx_fragment_fragment
 description: "Android Support Library fragment"
 data:
-- file: fragment-1.1.0.aar
+- file: fragment-1.2.5.aar

third_party/android_deps/libs/androidx_lifecycle_lifecycle_common/README.chromium

 Name: Android Lifecycle-Common
 Short Name: lifecycle-common
 URL: https://developer.android.com/topic/libraries/architecture/index.html
-Version: 2.1.0
+Version: 2.2.0
 License: Apache Version 2.0
 License File: LICENSE
 Security Critical: yes

third_party/android_deps/libs/androidx_lifecycle_lifecycle_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-cr0
 package: chromium/third_party/android_deps/libs/androidx_lifecycle_lifecycle_common
 description: "Android Lifecycle-Common"
 data:
-- file: lifecycle-common-2.1.0.jar
+- file: lifecycle-common-2.2.0.jar

third_party/android_deps/libs/androidx_lifecycle_lifecycle_livedata_core/README.chromium

 Name: Android Lifecycle LiveData Core
 Short Name: lifecycle-livedata-core
 URL: https://developer.android.com/topic/libraries/architecture/index.html
-Version: 2.0.0
+Version: 2.2.0
 License: Apache Version 2.0
 License File: LICENSE
 Security Critical: yes

third_party/android_deps/libs/androidx_lifecycle_lifecycle_livedata_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:2.0.0-cr0
+# cipd create --pkg-def cipd.yaml -tag version:2.2.0-cr0
 package: chromium/third_party/android_deps/libs/androidx_lifecycle_lifecycle_livedata_core
 description: "Android Lifecycle LiveData Core"
 data:
-- file: lifecycle-livedata-core-2.0.0.aar
+- file: lifecycle-livedata-core-2.2.0.aar

third_party/android_deps/libs/androidx_lifecycle_lifecycle_runtime/README.chromium

 Name: Android Lifecycle Runtime
 Short Name: lifecycle-runtime
 URL: https://developer.android.com/topic/libraries/architecture/index.html
-Version: 2.1.0
+Version: 2.2.0
 License: Apache Version 2.0
 License File: LICENSE
 Security Critical: yes

third_party/android_deps/libs/androidx_lifecycle_lifecycle_runtime/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-cr0
 package: chromium/third_party/android_deps/libs/androidx_lifecycle_lifecycle_runtime
 description: "Android Lifecycle Runtime"
 data:
-- file: lifecycle-runtime-2.1.0.aar
+- file: lifecycle-runtime-2.2.0.aar

third_party/android_deps/libs/androidx_lifecycle_lifecycle_viewmodel/README.chromium

 Name: Android Lifecycle ViewModel
 Short Name: lifecycle-viewmodel
 URL: https://developer.android.com/topic/libraries/architecture/index.html
-Version: 2.1.0
+Version: 2.2.0
 License: Apache Version 2.0
 License File: LICENSE
 Security Critical: yes

third_party/android_deps/libs/androidx_lifecycle_lifecycle_viewmodel/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-cr0
 package: chromium/third_party/android_deps/libs/androidx_lifecycle_lifecycle_viewmodel
 description: "Android Lifecycle ViewModel"
 data:
-- file: lifecycle-viewmodel-2.1.0.aar
+- file: lifecycle-viewmodel-2.2.0.aar

third_party/android_deps/libs/androidx_lifecycle_lifecycle_viewmodel_savedstate/OWNERS

+file://third_party/android_deps/OWNERS
\ No newline at end of file

third_party/android_deps/libs/androidx_lifecycle_lifecycle_viewmodel_savedstate/README.chromium

+Name: Android Lifecycle ViewModel with SavedState
+Short Name: lifecycle-viewmodel-savedstate
+URL: https://developer.android.com/topic/libraries/architecture/index.html
+Version: 2.2.0
+License: Apache Version 2.0
+License File: LICENSE
+Security Critical: yes
+
+Description:
+Android Lifecycle ViewModel
+
+Local Modifications:
+No modifications.

third_party/android_deps/libs/androidx_lifecycle_lifecycle_viewmodel_savedstate/androidx_lifecycle_lifecycle_viewmodel_savedstate.info

+# Generated by //build/android/gyp/aar.py
+# To regenerate, use "update_android_aar_prebuilts = true" and run "gn gen".
+
+aidl = []
+assets = []
+has_classes_jar = true
+has_native_libraries = false
+has_proguard_flags = true
+has_r_text_file = false
+is_manifest_empty = true
+resources = []
+subjar_tuples = []
+subjars = []

third_party/android_deps/libs/androidx_lifecycle_lifecycle_viewmodel_savedstate/cipd.yaml

+# Copyright 2018 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# To create CIPD package run the following command.
+# cipd create --pkg-def cipd.yaml -tag version:2.2.0-cr0
+package: chromium/third_party/android_deps/libs/androidx_lifecycle_lifecycle_viewmodel_savedstate
+description: "Android Lifecycle ViewModel with SavedState"
+data:
+- file: lifecycle-viewmodel-savedstate-2.2.0.aar

third_party/android_deps/libs/androidx_preference_preference/README.chromium

-Name: Android Support Preference v7
+Name: AndroidX Preference
 Short Name: preference
-URL: http://developer.android.com/tools/extras/support-library.html
-Version: 1.0.0
+URL: https://developer.android.com/jetpack/androidx
+Version: 1.1.1
 License: Apache Version 2.0
 License File: LICENSE
 Security Critical: yes
 
 Description:
-Android Support Preference v7
+AndroidX Preference
 
 Local Modifications:
 No modifications.

third_party/android_deps/libs/androidx_preference_preference/androidx_preference_preference.info

@@ -9,17 +9,12 @@ has_proguard_flags = true
 has_r_text_file = true
 is_manifest_empty = true
 resources = [
+  "res/drawable/ic_arrow_down_24dp.xml",
   "res/drawable/preference_list_divider_material.xml",
-  "res/drawable-anydpi-v21/ic_arrow_down_24dp.xml",
-  "res/drawable-hdpi-v4/ic_arrow_down_24dp.png",
-  "res/drawable-ldpi-v4/ic_arrow_down_24dp.png",
-  "res/drawable-mdpi-v4/ic_arrow_down_24dp.png",
   "res/drawable-v21/ic_arrow_down_24dp.xml",
   "res/drawable-v21/preference_list_divider_material.xml",
-  "res/drawable-xhdpi-v4/ic_arrow_down_24dp.png",
-  "res/drawable-xxhdpi-v4/ic_arrow_down_24dp.png",
-  "res/drawable-xxxhdpi-v4/ic_arrow_down_24dp.png",
   "res/layout/expand_button.xml",
+  "res/layout/image_frame.xml",
   "res/layout/preference.xml",
   "res/layout/preference_category.xml",
   "res/layout/preference_category_material.xml",
@@ -36,20 +31,11 @@ resources = [
   "res/layout/preference_widget_seekbar_material.xml",
   "res/layout/preference_widget_switch.xml",
   "res/layout/preference_widget_switch_compat.xml",
-  "res/layout-v17/preference_category_material.xml",
-  "res/layout-v17/preference_dropdown_material.xml",
-  "res/layout-v17/preference_information_material.xml",
-  "res/layout-v17/preference_material.xml",
-  "res/layout-v17/preference_widget_seekbar_material.xml",
-  "res/layout-v21/preference_category_material.xml",
-  "res/layout-v21/preference_dropdown_material.xml",
-  "res/layout-v21/preference_information_material.xml",
-  "res/layout-v21/preference_material.xml",
-  "res/layout-v21/preference_widget_seekbar_material.xml",
   "res/values/values.xml",
   "res/values-af/values-af.xml",
   "res/values-am/values-am.xml",
   "res/values-ar/values-ar.xml",
+  "res/values-as/values-as.xml",
   "res/values-az/values-az.xml",
   "res/values-b+sr+Latn/values-b+sr+Latn.xml",
   "res/values-be/values-be.xml",
@@ -103,6 +89,7 @@ resources = [
   "res/values-nb/values-nb.xml",
   "res/values-ne/values-ne.xml",
   "res/values-nl/values-nl.xml",
+  "res/values-or/values-or.xml",
   "res/values-pa/values-pa.xml",
   "res/values-pl/values-pl.xml",
   "res/values-pt/values-pt.xml",
@@ -126,7 +113,6 @@ resources = [
   "res/values-uk/values-uk.xml",
   "res/values-ur/values-ur.xml",
   "res/values-uz/values-uz.xml",
-  "res/values-v17/values-v17.xml",
   "res/values-v21/values-v21.xml",
   "res/values-vi/values-vi.xml",
   "res/values-zh-rCN/values-zh-rCN.xml",

third_party/android_deps/libs/androidx_preference_preference/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.1-cr0
 package: chromium/third_party/android_deps/libs/androidx_preference_preference
-description: "Android Support Preference v7"
+description: "AndroidX Preference"
 data:
-- file: preference-1.0.0.aar
+- file: preference-1.1.1.aar