Merge "Don't reference getPinnedSpecs List APIs" into pi-androidx-dev
diff --git a/jetifier/jetifier/core/src/main/resources/default.config b/jetifier/jetifier/core/src/main/resources/default.config
index bec56c3..a4aeadf 100644
--- a/jetifier/jetifier/core/src/main/resources/default.config
+++ b/jetifier/jetifier/core/src/main/resources/default.config
@@ -1112,6 +1112,10 @@
             "from": { "groupId": "com.android.support.test.uiautomator", "artifactId": "uiautomator-v18", "version": "28.0.0" },
             "to": [{ "groupId": "androidx.test.uiautomator", "artifactId": "uiautomator", "version": "1.0.0" }]
         },
+        {
+            "from": { "groupId": "com.android.support", "artifactId": "car", "version": "28.0.0" },
+            "to": [{ "groupId": "androidx.car", "artifactId": "car", "version": "1.0.0" }]
+        },
         # Keep it same
         {
             "from": { "groupId": "com.android.support", "artifactId": "slices-core", "version": "28.0.0" },
diff --git a/jetifier/jetifier/core/src/main/resources/default.generated.config b/jetifier/jetifier/core/src/main/resources/default.generated.config
index 57590dd..66dfa5a 100644
--- a/jetifier/jetifier/core/src/main/resources/default.generated.config
+++ b/jetifier/jetifier/core/src/main/resources/default.generated.config
@@ -2104,6 +2104,20 @@
     {
       "from": {
         "groupId": "com.android.support",
+        "artifactId": "car",
+        "version": "28.0.0"
+      },
+      "to": [
+        {
+          "groupId": "androidx.car",
+          "artifactId": "car",
+          "version": "1.0.0"
+        }
+      ]
+    },
+    {
+      "from": {
+        "groupId": "com.android.support",
         "artifactId": "slices-core",
         "version": "28.0.0"
       },
@@ -2244,59 +2258,23 @@
   ],
   "map": {
     "types": {
+      "android/support/v4/widget/SlidingPaneLayout": "androidx/slidingpanelayout/widget/SlidingPaneLayout",
+      "android/support/v4/view/AccessibilityDelegateCompat": "androidx/core/view/AccessibilityDelegateCompat",
+      "android/support/v4/view/accessibility/AccessibilityNodeInfoCompat": "androidx/core/view/accessibility/AccessibilityNodeInfoCompat",
+      "android/support/v4/view/ViewCompat": "androidx/core/view/ViewCompat",
+      "android/support/v4/widget/ViewDragHelper": "androidx/customview/widget/ViewDragHelper",
       "android/support/annotation/NonNull": "androidx/annotation/NonNull",
-      "android/support/annotation/RestrictTo": "androidx/annotation/RestrictTo",
-      "android/support/v4/os/BuildCompat": "androidx/core/os/BuildCompat",
       "android/support/annotation/Nullable": "androidx/annotation/Nullable",
+      "android/support/v4/view/AbsSavedState": "androidx/customview/view/AbsSavedState",
       "android/support/annotation/RequiresApi": "androidx/annotation/RequiresApi",
+      "android/support/annotation/Px": "androidx/annotation/Px",
       "android/support/annotation/ColorInt": "androidx/annotation/ColorInt",
-      "android/support/v7/widget/RecyclerView": "androidx/recyclerview/widget/RecyclerView",
-      "android/support/v7/widget/LinearLayoutManager": "androidx/recyclerview/widget/LinearLayoutManager",
-      "android/arch/lifecycle/LiveData": "androidx/lifecycle/LiveData",
-      "android/arch/lifecycle/Observer": "androidx/lifecycle/Observer",
-      "android/support/annotation/AttrRes": "androidx/annotation/AttrRes",
-      "android/databinding/BindingAdapter": "androidx/databinding/BindingAdapter",
-      "android/databinding/BindingMethod": "androidx/databinding/BindingMethod",
-      "android/databinding/ObservableMap": "androidx/databinding/ObservableMap",
-      "android/databinding/BindingBuildInfo": "androidx/databinding/BindingBuildInfo",
-      "android/databinding/Observable": "androidx/databinding/Observable",
-      "android/databinding/Untaggable": "androidx/databinding/Untaggable",
-      "android/databinding/InverseBindingMethod": "androidx/databinding/InverseBindingMethod",
-      "android/databinding/CallbackRegistry": "androidx/databinding/CallbackRegistry",
-      "android/databinding/BindingMethods": "androidx/databinding/BindingMethods",
-      "android/databinding/InverseBindingListener": "androidx/databinding/InverseBindingListener",
-      "android/databinding/BindingConversion": "androidx/databinding/BindingConversion",
-      "android/databinding/ObservableList": "androidx/databinding/ObservableList",
-      "android/databinding/InverseBindingMethods": "androidx/databinding/InverseBindingMethods",
-      "android/databinding/InverseMethod": "androidx/databinding/InverseMethod",
-      "android/databinding/Bindable": "androidx/databinding/Bindable",
-      "android/databinding/InverseBindingAdapter": "androidx/databinding/InverseBindingAdapter",
-      "android/support/design/drawable/DrawableUtils": "android/support/design/drawable/DrawableUtils",
-      "android/support/app/recommendation/ContentRecommendation": "androidx/recommendation/app/ContentRecommendation",
       "android/support/annotation/DrawableRes": "androidx/annotation/DrawableRes",
-      "android/support/app/recommendation/RecommendationExtender": "androidx/recommendation/app/RecommendationExtender",
-      "android/arch/lifecycle/ErrorMessages": "androidx/lifecycle/ErrorMessages",
-      "android/arch/lifecycle/model/EventMethod": "androidx/lifecycle/model/EventMethod",
-      "android/arch/lifecycle/Elements_extKt": "androidx/lifecycle/Elements_extKt",
-      "android/arch/lifecycle/WriterKt": "androidx/lifecycle/WriterKt",
-      "android/arch/lifecycle/ObserversCollector": "androidx/lifecycle/ObserversCollector",
-      "android/arch/lifecycle/Validator": "androidx/lifecycle/Validator",
-      "android/arch/lifecycle/model/LifecycleObserverInfo": "androidx/lifecycle/model/LifecycleObserverInfo",
-      "android/arch/lifecycle/model/AdapterClassKt": "androidx/lifecycle/model/AdapterClassKt",
-      "android/arch/lifecycle/OnLifecycleEvent": "androidx/lifecycle/OnLifecycleEvent",
-      "android/arch/lifecycle/Lifecycle": "androidx/lifecycle/Lifecycle",
-      "android/arch/lifecycle/LifecycleObserver": "androidx/lifecycle/LifecycleObserver",
-      "android/arch/lifecycle/model/EventMethodCall": "androidx/lifecycle/model/EventMethodCall",
-      "android/arch/lifecycle/model/AdapterClass": "androidx/lifecycle/model/AdapterClass",
-      "android/arch/lifecycle/model/InputModel": "androidx/lifecycle/model/InputModel",
-      "android/arch/lifecycle/Lifecycling": "androidx/lifecycle/Lifecycling",
-      "android/arch/lifecycle/LifecycleProcessor": "androidx/lifecycle/LifecycleProcessor",
-      "android/arch/lifecycle/Input_collectorKt": "androidx/lifecycle/Input_collectorKt",
-      "android/arch/lifecycle/TransformationKt": "androidx/lifecycle/TransformationKt",
-      "android/arch/lifecycle/GeneratedAdapter": "androidx/lifecycle/GeneratedAdapter",
-      "android/arch/lifecycle/LifecycleOwner": "androidx/lifecycle/LifecycleOwner",
-      "android/arch/lifecycle/MethodCallsLogger": "androidx/lifecycle/MethodCallsLogger",
+      "android/support/v4/content/ContextCompat": "androidx/core/content/ContextCompat",
+      "android/support/v4/content/LocalBroadcastManager": "androidx/localbroadcastmanager/content/LocalBroadcastManager",
+      "android/support/v4/content/WakefulBroadcastReceiver": "androidx/legacy/content/WakefulBroadcastReceiver",
       "android/support/v4/media/AudioAttributesCompat": "androidx/media/AudioAttributesCompat",
+      "android/support/annotation/RestrictTo": "androidx/annotation/RestrictTo",
       "android/support/v4/media/AudioAttributesCompatApi21": "androidx/media/AudioAttributesCompatApi21",
       "android/support/v4/media/MediaBrowserCompat": "android/support/v4/media/MediaBrowserCompat",
       "android/support/v4/media/session/MediaSessionCompat": "android/support/v4/media/session/MediaSessionCompat",
@@ -2342,529 +2320,77 @@
       "android/support/v4/media/session/MediaSessionCompatApi22": "android/support/v4/media/session/MediaSessionCompatApi22",
       "android/support/v4/media/session/PlaybackStateCompatApi21": "android/support/v4/media/session/PlaybackStateCompatApi21",
       "android/support/v4/media/session/PlaybackStateCompatApi22": "android/support/v4/media/session/PlaybackStateCompatApi22",
-      "android/support/annotation/AnimRes": "androidx/annotation/AnimRes",
-      "android/support/annotation/AnimatorRes": "androidx/annotation/AnimatorRes",
-      "android/support/annotation/AnyRes": "androidx/annotation/AnyRes",
-      "android/support/annotation/AnyThread": "androidx/annotation/AnyThread",
-      "android/support/annotation/ArrayRes": "androidx/annotation/ArrayRes",
-      "android/support/annotation/BinderThread": "androidx/annotation/BinderThread",
-      "android/support/annotation/BoolRes": "androidx/annotation/BoolRes",
-      "android/support/annotation/CallSuper": "androidx/annotation/CallSuper",
-      "android/support/annotation/CheckResult": "androidx/annotation/CheckResult",
-      "android/support/annotation/ColorLong": "androidx/annotation/ColorLong",
-      "android/support/annotation/ColorRes": "androidx/annotation/ColorRes",
-      "android/support/annotation/DimenRes": "androidx/annotation/DimenRes",
-      "android/support/annotation/Dimension": "androidx/annotation/Dimension",
-      "android/support/annotation/FloatRange": "androidx/annotation/FloatRange",
-      "android/support/annotation/FontRes": "androidx/annotation/FontRes",
-      "android/support/annotation/FractionRes": "androidx/annotation/FractionRes",
-      "android/support/annotation/GuardedBy": "androidx/annotation/GuardedBy",
-      "android/support/annotation/HalfFloat": "androidx/annotation/HalfFloat",
-      "android/support/annotation/IdRes": "androidx/annotation/IdRes",
-      "android/support/annotation/IntDef": "androidx/annotation/IntDef",
-      "android/support/annotation/IntRange": "androidx/annotation/IntRange",
-      "android/support/annotation/IntegerRes": "androidx/annotation/IntegerRes",
-      "android/support/annotation/InterpolatorRes": "androidx/annotation/InterpolatorRes",
-      "android/support/annotation/Keep": "androidx/annotation/Keep",
-      "android/support/annotation/LayoutRes": "androidx/annotation/LayoutRes",
-      "android/support/annotation/LongDef": "androidx/annotation/LongDef",
-      "android/support/annotation/MainThread": "androidx/annotation/MainThread",
-      "android/support/annotation/MenuRes": "androidx/annotation/MenuRes",
-      "android/support/annotation/NavigationRes": "androidx/annotation/NavigationRes",
-      "android/support/annotation/PluralsRes": "androidx/annotation/PluralsRes",
-      "android/support/annotation/Px": "androidx/annotation/Px",
-      "android/support/annotation/RawRes": "androidx/annotation/RawRes",
-      "android/support/annotation/RequiresPermission": "androidx/annotation/RequiresPermission",
-      "android/support/annotation/Size": "androidx/annotation/Size",
-      "android/support/annotation/StringDef": "androidx/annotation/StringDef",
-      "android/support/annotation/StringRes": "androidx/annotation/StringRes",
-      "android/support/annotation/StyleRes": "androidx/annotation/StyleRes",
-      "android/support/annotation/StyleableRes": "androidx/annotation/StyleableRes",
-      "android/support/annotation/TransitionRes": "androidx/annotation/TransitionRes",
-      "android/support/annotation/UiThread": "androidx/annotation/UiThread",
-      "android/support/annotation/VisibleForTesting": "androidx/annotation/VisibleForTesting",
-      "android/support/annotation/WorkerThread": "androidx/annotation/WorkerThread",
-      "android/support/annotation/XmlRes": "androidx/annotation/XmlRes",
-      "android/support/design/stateful/ExtendableSavedState": "android/support/design/stateful/ExtendableSavedState",
-      "android/support/v4/view/AbsSavedState": "androidx/customview/view/AbsSavedState",
-      "android/support/v4/util/SimpleArrayMap": "androidx/collection/SimpleArrayMap",
-      "android/support/design/shape/CornerTreatment": "android/support/design/shape/CornerTreatment",
-      "android/support/design/shape/ShapePath": "android/support/design/shape/ShapePath",
-      "android/support/design/shape/CutCornerTreatment": "android/support/design/shape/CutCornerTreatment",
-      "android/support/design/shape/EdgeTreatment": "android/support/design/shape/EdgeTreatment",
-      "android/support/design/shape/InterpolateOnScrollPositionChangeHelper": "android/support/design/shape/InterpolateOnScrollPositionChangeHelper",
-      "android/support/design/shape/MaterialShapeDrawable": "android/support/design/shape/MaterialShapeDrawable",
-      "android/support/v4/graphics/drawable/TintAwareDrawable": "androidx/core/graphics/drawable/TintAwareDrawable",
-      "android/support/design/shape/ShapePathModel": "android/support/design/shape/ShapePathModel",
-      "android/support/design/shape/RoundedCornerTreatment": "android/support/design/shape/RoundedCornerTreatment",
-      "android/support/design/shape/TriangleEdgeTreatment": "android/support/design/shape/TriangleEdgeTreatment",
-      "android/support/v4/widget/DrawerLayout": "androidx/drawerlayout/widget/DrawerLayout",
-      "android/support/v4/view/AccessibilityDelegateCompat": "androidx/core/view/AccessibilityDelegateCompat",
-      "android/support/v4/view/accessibility/AccessibilityNodeInfoCompat": "androidx/core/view/accessibility/AccessibilityNodeInfoCompat",
-      "android/support/v4/view/ViewCompat": "androidx/core/view/ViewCompat",
-      "android/support/v4/widget/ViewDragHelper": "androidx/customview/widget/ViewDragHelper",
-      "android/support/v4/content/ContextCompat": "androidx/core/content/ContextCompat",
-      "android/support/v4/view/GravityCompat": "androidx/core/view/GravityCompat",
-      "android/support/v4/graphics/drawable/DrawableCompat": "androidx/core/graphics/drawable/DrawableCompat",
-      "android/support/design/ripple/RippleUtils": "android/support/design/ripple/RippleUtils",
-      "android/support/v4/graphics/ColorUtils": "androidx/core/graphics/ColorUtils",
-      "android/support/design/resources/MaterialResources": "android/support/design/resources/MaterialResources",
-      "android/support/v7/content/res/AppCompatResources": "androidx/appcompat/content/res/AppCompatResources",
-      "android/support/design/resources/TextAppearance": "android/support/design/resources/TextAppearance",
-      "android/support/design/resources/R": "android/support/design/resources/R",
-      "android/support/v4/content/res/ResourcesCompat": "androidx/core/content/res/ResourcesCompat",
-      "android/arch/lifecycle/DefaultLifecycleObserver": "androidx/lifecycle/DefaultLifecycleObserver",
-      "android/arch/lifecycle/FullLifecycleObserver": "androidx/lifecycle/FullLifecycleObserver",
-      "android/support/multidex/ZipUtil": "androidx/multidex/ZipUtil",
-      "android/support/multidex/MultiDexExtractor": "androidx/multidex/MultiDexExtractor",
-      "android/support/multidex/MultiDex": "androidx/multidex/MultiDex",
-      "android/support/multidex/MultiDexApplication": "androidx/multidex/MultiDexApplication",
-      "android/support/v7/widget/CardView": "androidx/cardview/widget/CardView",
-      "android/support/v7/widget/CardViewDelegate": "androidx/cardview/widget/CardViewDelegate",
-      "android/support/v7/cardview/R": "androidx/cardview/R",
-      "android/support/v7/widget/CardViewImpl": "androidx/cardview/widget/CardViewImpl",
-      "android/support/v7/widget/CardViewApi21Impl": "androidx/cardview/widget/CardViewApi21Impl",
-      "android/support/v7/widget/CardViewApi17Impl": "androidx/cardview/widget/CardViewApi17Impl",
-      "android/support/v7/widget/CardViewBaseImpl": "androidx/cardview/widget/CardViewBaseImpl",
-      "android/support/v7/widget/RoundRectDrawableWithShadow": "androidx/cardview/widget/RoundRectDrawableWithShadow",
-      "android/support/v7/widget/RoundRectDrawable": "androidx/cardview/widget/RoundRectDrawable",
-      "android/arch/persistence/room/DatabaseConfiguration": "androidx/room/DatabaseConfiguration",
-      "android/arch/persistence/db/SupportSQLiteOpenHelper": "androidx/sqlite/db/SupportSQLiteOpenHelper",
-      "android/arch/persistence/room/RoomDatabase": "androidx/room/RoomDatabase",
-      "android/arch/persistence/room/EntityDeletionOrUpdateAdapter": "androidx/room/EntityDeletionOrUpdateAdapter",
-      "android/arch/persistence/room/SharedSQLiteStatement": "androidx/room/SharedSQLiteStatement",
-      "android/arch/persistence/db/SupportSQLiteStatement": "androidx/sqlite/db/SupportSQLiteStatement",
-      "android/arch/persistence/room/EntityInsertionAdapter": "androidx/room/EntityInsertionAdapter",
-      "android/arch/persistence/room/InvalidationTracker": "androidx/room/InvalidationTracker",
-      "android/arch/persistence/db/SupportSQLiteDatabase": "androidx/sqlite/db/SupportSQLiteDatabase",
-      "android/arch/core/internal/SafeIterableMap": "androidx/arch/core/internal/SafeIterableMap",
-      "android/support/v4/util/ArraySet": "androidx/collection/ArraySet",
-      "android/arch/core/executor/ArchTaskExecutor": "androidx/arch/core/executor/ArchTaskExecutor",
-      "android/arch/persistence/room/Room": "androidx/room/Room",
-      "android/arch/persistence/room/migration/Migration": "androidx/room/migration/Migration",
-      "android/arch/persistence/db/framework/FrameworkSQLiteOpenHelperFactory": "androidx/sqlite/db/framework/FrameworkSQLiteOpenHelperFactory",
-      "android/support/v4/app/ActivityManagerCompat": "androidx/core/app/ActivityManagerCompat",
-      "android/support/v4/util/SparseArrayCompat": "androidx/collection/SparseArrayCompat",
-      "android/arch/persistence/db/SimpleSQLiteQuery": "androidx/sqlite/db/SimpleSQLiteQuery",
-      "android/arch/persistence/db/SupportSQLiteQuery": "androidx/sqlite/db/SupportSQLiteQuery",
-      "android/arch/persistence/room/RoomOpenHelper": "androidx/room/RoomOpenHelper",
-      "android/arch/persistence/room/RoomMasterTable": "androidx/room/RoomMasterTable",
-      "android/arch/persistence/room/RoomSQLiteQuery": "androidx/room/RoomSQLiteQuery",
-      "android/arch/persistence/db/SupportSQLiteProgram": "androidx/sqlite/db/SupportSQLiteProgram",
-      "android/arch/persistence/room/paging/LimitOffsetDataSource": "androidx/room/paging/LimitOffsetDataSource",
-      "android/arch/paging/PositionalDataSource": "androidx/paging/PositionalDataSource",
-      "android/arch/persistence/room/util/StringUtil": "androidx/room/util/StringUtil",
-      "android/arch/persistence/room/util/TableInfo": "androidx/room/util/TableInfo",
-      "android/arch/persistence/room/ColumnInfo": "androidx/room/ColumnInfo",
-      "android/support/text/emoji/bundled/BundledEmojiCompatConfig": "androidx/emoji/bundled/BundledEmojiCompatConfig",
-      "android/support/text/emoji/EmojiCompat": "androidx/emoji/text/EmojiCompat",
-      "android/support/v4/util/Preconditions": "androidx/core/util/Preconditions",
-      "android/support/text/emoji/MetadataRepo": "androidx/emoji/text/MetadataRepo",
-      "android/support/v7/graphics/ColorCutQuantizer": "androidx/palette/graphics/ColorCutQuantizer",
-      "android/support/v7/graphics/Palette": "androidx/palette/graphics/Palette",
-      "android/support/v7/graphics/Target": "androidx/palette/graphics/Target",
-      "android/arch/persistence/room/EmptyResultSetException": "androidx/room/EmptyResultSetException",
-      "android/arch/persistence/room/RxRoom": "androidx/room/RxRoom",
-      "android/support/v4/app/ActionBarDrawerToggle": "androidx/legacy/app/ActionBarDrawerToggle",
-      "android/support/v4/widget/Space": "androidx/legacy/widget/Space",
-      "android/support/animation/AnimationHandler": "androidx/dynamicanimation/animation/AnimationHandler",
-      "android/support/animation/DynamicAnimation": "androidx/dynamicanimation/animation/DynamicAnimation",
-      "android/support/animation/FloatPropertyCompat": "androidx/dynamicanimation/animation/FloatPropertyCompat",
-      "android/support/animation/FloatValueHolder": "androidx/dynamicanimation/animation/FloatValueHolder",
-      "android/support/animation/FlingAnimation": "androidx/dynamicanimation/animation/FlingAnimation",
-      "android/support/animation/Force": "androidx/dynamicanimation/animation/Force",
-      "android/support/animation/SpringAnimation": "androidx/dynamicanimation/animation/SpringAnimation",
-      "android/support/animation/SpringForce": "androidx/dynamicanimation/animation/SpringForce",
-      "android/arch/persistence/db/framework/FrameworkSQLiteDatabase": "androidx/sqlite/db/framework/FrameworkSQLiteDatabase",
-      "android/arch/persistence/db/framework/FrameworkSQLiteProgram": "androidx/sqlite/db/framework/FrameworkSQLiteProgram",
-      "android/arch/persistence/db/framework/FrameworkSQLiteStatement": "androidx/sqlite/db/framework/FrameworkSQLiteStatement",
-      "android/arch/persistence/db/framework/FrameworkSQLiteOpenHelper": "androidx/sqlite/db/framework/FrameworkSQLiteOpenHelper",
-      "android/arch/persistence/room/guava/GuavaRoom": "androidx/room/guava/GuavaRoom",
-      "android/arch/lifecycle/LiveDataReactiveStreams": "androidx/lifecycle/LiveDataReactiveStreams",
-      "android/support/v4/widget/CircleImageView": "androidx/swiperefreshlayout/widget/CircleImageView",
-      "android/support/v4/widget/CircularProgressDrawable": "androidx/swiperefreshlayout/widget/CircularProgressDrawable",
-      "android/support/v4/view/animation/FastOutSlowInInterpolator": "androidx/interpolator/view/animation/FastOutSlowInInterpolator",
-      "android/support/v4/widget/SwipeRefreshLayout": "androidx/swiperefreshlayout/widget/SwipeRefreshLayout",
-      "android/support/v4/view/NestedScrollingParent": "androidx/core/view/NestedScrollingParent",
-      "android/support/v4/view/NestedScrollingChild": "androidx/core/view/NestedScrollingChild",
-      "android/support/v4/view/NestedScrollingParentHelper": "androidx/core/view/NestedScrollingParentHelper",
-      "android/support/v4/view/NestedScrollingChildHelper": "androidx/core/view/NestedScrollingChildHelper",
-      "android/support/v4/widget/ListViewCompat": "androidx/core/widget/ListViewCompat",
-      "android/support/design/bottomappbar/BottomAppBar": "android/support/design/bottomappbar/BottomAppBar",
-      "android/support/design/bottomappbar/BottomAppBarTopEdgeTreatment": "android/support/design/bottomappbar/BottomAppBarTopEdgeTreatment",
-      "android/support/v7/widget/ActionMenuView": "androidx/appcompat/widget/ActionMenuView",
-      "android/support/design/widget/CoordinatorLayout": "androidx/coordinatorlayout/widget/CoordinatorLayout",
-      "android/support/design/widget/FloatingActionButton": "android/support/design/widget/FloatingActionButton",
-      "android/support/v7/widget/Toolbar": "androidx/appcompat/widget/Toolbar",
-      "android/support/design/bottomappbar/R": "android/support/design/bottomappbar/R",
-      "android/arch/paging/AsyncPagedListDiffer": "androidx/paging/AsyncPagedListDiffer",
-      "android/arch/paging/PagedList": "androidx/paging/PagedList",
-      "android/support/v7/util/ListUpdateCallback": "androidx/recyclerview/widget/ListUpdateCallback",
-      "android/support/v7/util/DiffUtil": "androidx/recyclerview/widget/DiffUtil",
-      "android/arch/paging/PagedStorage": "androidx/paging/PagedStorage",
       "android/support/v7/recyclerview/extensions/AsyncDifferConfig": "androidx/recyclerview/widget/AsyncDifferConfig",
-      "android/arch/paging/PagedStorageDiffHelper": "androidx/paging/PagedStorageDiffHelper",
+      "android/support/v7/util/DiffUtil": "androidx/recyclerview/widget/DiffUtil",
+      "android/support/v7/recyclerview/extensions/AsyncListDiffer": "androidx/recyclerview/widget/AsyncListDiffer",
+      "android/support/v7/widget/RecyclerView": "androidx/recyclerview/widget/RecyclerView",
+      "android/support/v7/util/ListUpdateCallback": "androidx/recyclerview/widget/ListUpdateCallback",
       "android/support/v7/util/AdapterListUpdateCallback": "androidx/recyclerview/widget/AdapterListUpdateCallback",
-      "android/arch/paging/LivePagedListBuilder": "androidx/paging/LivePagedListBuilder",
-      "android/arch/paging/DataSource": "androidx/paging/DataSource",
-      "android/arch/lifecycle/ComputableLiveData": "androidx/lifecycle/ComputableLiveData",
-      "android/arch/paging/LivePagedListProvider": "androidx/paging/LivePagedListProvider",
-      "android/arch/paging/PagedListAdapter": "androidx/paging/PagedListAdapter",
-      "android/support/design/chip/Chip": "android/support/design/chip/Chip",
-      "android/support/design/chip/ChipDrawable": "android/support/design/chip/ChipDrawable",
-      "android/support/v4/widget/ExploreByTouchHelper": "androidx/customview/widget/ExploreByTouchHelper",
-      "android/support/design/chip/R": "android/support/design/chip/R",
-      "android/support/v7/widget/AppCompatCheckBox": "androidx/appcompat/widget/AppCompatCheckBox",
-      "android/support/design/animation/MotionSpec": "android/support/design/animation/MotionSpec",
-      "android/support/design/canvas/CanvasCompat": "android/support/design/canvas/CanvasCompat",
-      "android/support/v4/text/BidiFormatter": "androidx/core/text/BidiFormatter",
-      "android/support/design/chip/ChipGroup": "android/support/design/chip/ChipGroup",
-      "android/support/v4/app/LoaderManager": "androidx/loader/app/LoaderManager",
-      "android/support/v4/content/Loader": "androidx/loader/content/Loader",
-      "android/arch/lifecycle/ViewModelStoreOwner": "androidx/lifecycle/ViewModelStoreOwner",
-      "android/support/v4/app/LoaderManagerImpl": "androidx/loader/app/LoaderManagerImpl",
-      "android/arch/lifecycle/ViewModelStore": "androidx/lifecycle/ViewModelStore",
-      "android/arch/lifecycle/MutableLiveData": "androidx/lifecycle/MutableLiveData",
-      "android/support/v4/util/DebugUtils": "androidx/core/util/DebugUtils",
-      "android/arch/lifecycle/ViewModelProvider": "androidx/lifecycle/ViewModelProvider",
-      "android/arch/lifecycle/ViewModel": "androidx/lifecycle/ViewModel",
-      "android/support/v4/content/AsyncTaskLoader": "androidx/loader/content/AsyncTaskLoader",
-      "android/support/v4/content/ModernAsyncTask": "androidx/loader/content/ModernAsyncTask",
-      "android/support/v4/os/OperationCanceledException": "androidx/core/os/OperationCanceledException",
-      "android/support/v4/util/TimeUtils": "androidx/core/util/TimeUtils",
-      "android/support/v4/content/CursorLoader": "androidx/loader/content/CursorLoader",
-      "android/support/v4/os/CancellationSignal": "androidx/core/os/CancellationSignal",
-      "android/support/v4/content/ContentResolverCompat": "androidx/core/content/ContentResolverCompat",
-      "android/arch/persistence/room/migration/bundle/DatabaseBundle": "androidx/room/migration/bundle/DatabaseBundle",
-      "android/arch/persistence/room/migration/bundle/SchemaEquality": "androidx/room/migration/bundle/SchemaEquality",
-      "android/arch/persistence/room/migration/bundle/EntityBundle": "androidx/room/migration/bundle/EntityBundle",
-      "android/arch/persistence/room/migration/bundle/SchemaEqualityUtil": "androidx/room/migration/bundle/SchemaEqualityUtil",
-      "android/arch/persistence/room/migration/bundle/FieldBundle": "androidx/room/migration/bundle/FieldBundle",
-      "android/arch/persistence/room/migration/bundle/IndexBundle": "androidx/room/migration/bundle/IndexBundle",
-      "android/arch/persistence/room/migration/bundle/BundleUtil": "androidx/room/migration/bundle/BundleUtil",
-      "android/arch/persistence/room/migration/bundle/PrimaryKeyBundle": "androidx/room/migration/bundle/PrimaryKeyBundle",
-      "android/arch/persistence/room/migration/bundle/ForeignKeyBundle": "androidx/room/migration/bundle/ForeignKeyBundle",
-      "android/arch/persistence/room/migration/bundle/SchemaBundle": "androidx/room/migration/bundle/SchemaBundle",
-      "android/support/design/widget/AppBarLayout": "android/support/design/widget/AppBarLayout",
-      "android/support/v4/view/OnApplyWindowInsetsListener": "androidx/core/view/OnApplyWindowInsetsListener",
-      "android/support/v4/view/WindowInsetsCompat": "androidx/core/view/WindowInsetsCompat",
-      "android/support/design/widget/HeaderBehavior": "android/support/design/widget/HeaderBehavior",
-      "android/support/design/animation/AnimationUtils": "android/support/design/animation/AnimationUtils",
-      "android/support/design/widget/MathUtils": "android/support/design/widget/MathUtils",
-      "android/support/design/widget/R": "android/support/design/widget/R",
-      "android/support/design/widget/HeaderScrollingViewBehavior": "android/support/design/widget/HeaderScrollingViewBehavior",
-      "android/support/design/widget/ViewUtilsLollipop": "android/support/design/widget/ViewUtilsLollipop",
-      "android/support/v4/util/ObjectsCompat": "androidx/core/util/ObjectsCompat",
-      "android/support/design/widget/BaseTransientBottomBar": "android/support/design/widget/BaseTransientBottomBar",
-      "android/support/design/snackbar/ContentViewCallback": "android/support/design/snackbar/ContentViewCallback",
-      "android/support/design/widget/SnackbarManager": "android/support/design/widget/SnackbarManager",
-      "android/support/design/widget/SwipeDismissBehavior": "android/support/design/widget/SwipeDismissBehavior",
-      "android/support/design/widget/BottomNavigationView": "android/support/design/widget/BottomNavigationView",
-      "android/support/v7/view/menu/MenuBuilder": "androidx/appcompat/view/menu/MenuBuilder",
-      "android/support/v7/view/menu/MenuPresenter": "androidx/appcompat/view/menu/MenuPresenter",
-      "android/support/v7/widget/TintTypedArray": "androidx/appcompat/widget/TintTypedArray",
-      "android/support/v7/view/SupportMenuInflater": "androidx/appcompat/view/SupportMenuInflater",
-      "android/support/design/widget/BottomSheetBehavior": "android/support/design/widget/BottomSheetBehavior",
-      "android/support/design/widget/BottomSheetDialog": "android/support/design/widget/BottomSheetDialog",
-      "android/support/v7/app/AppCompatDialog": "androidx/appcompat/app/AppCompatDialog",
-      "android/support/design/widget/BottomSheetDialogFragment": "android/support/design/widget/BottomSheetDialogFragment",
-      "android/support/v7/app/AppCompatDialogFragment": "androidx/appcompat/app/AppCompatDialogFragment",
-      "android/support/design/widget/CheckableImageButton": "android/support/design/widget/CheckableImageButton",
-      "android/support/v7/widget/AppCompatImageButton": "androidx/appcompat/widget/AppCompatImageButton",
-      "android/support/v7/appcompat/R": "androidx/appcompat/R",
-      "android/support/design/widget/CircularBorderDrawable": "android/support/design/widget/CircularBorderDrawable",
-      "android/support/design/widget/CircularBorderDrawableLollipop": "android/support/design/widget/CircularBorderDrawableLollipop",
-      "android/support/design/widget/CollapsingTextHelper": "android/support/design/widget/CollapsingTextHelper",
-      "android/support/v4/text/TextDirectionHeuristicsCompat": "androidx/core/text/TextDirectionHeuristicsCompat",
-      "android/support/v4/text/TextDirectionHeuristicCompat": "androidx/core/text/TextDirectionHeuristicCompat",
-      "android/support/design/widget/CollapsingToolbarLayout": "android/support/design/widget/CollapsingToolbarLayout",
-      "android/support/design/widget/ViewOffsetHelper": "android/support/design/widget/ViewOffsetHelper",
-      "android/support/design/widget/DescendantOffsetUtils": "android/support/design/widget/DescendantOffsetUtils",
-      "android/support/design/widget/CutoutDrawable": "android/support/design/widget/CutoutDrawable",
-      "android/support/design/widget/DrawableUtils": "android/support/design/widget/DrawableUtils",
-      "android/support/design/widget/FloatingActionButtonImpl": "android/support/design/widget/FloatingActionButtonImpl",
-      "android/support/design/widget/ShadowViewDelegate": "android/support/design/widget/ShadowViewDelegate",
-      "android/support/design/widget/VisibilityAwareImageButton": "android/support/design/widget/VisibilityAwareImageButton",
-      "android/support/v4/view/TintableBackgroundView": "androidx/core/view/TintableBackgroundView",
-      "android/support/v4/widget/TintableImageSourceView": "androidx/core/widget/TintableImageSourceView",
-      "android/support/design/expandable/ExpandableTransformationWidget": "android/support/design/expandable/ExpandableTransformationWidget",
-      "android/support/v7/widget/AppCompatImageHelper": "androidx/appcompat/widget/AppCompatImageHelper",
-      "android/support/design/expandable/ExpandableWidgetHelper": "android/support/design/expandable/ExpandableWidgetHelper",
-      "android/support/design/expandable/ExpandableWidget": "android/support/design/expandable/ExpandableWidget",
-      "android/support/v7/widget/AppCompatDrawableManager": "androidx/appcompat/widget/AppCompatDrawableManager",
-      "android/support/design/widget/FloatingActionButtonImplLollipop": "android/support/design/widget/FloatingActionButtonImplLollipop",
-      "android/support/design/widget/ShadowDrawableWrapper": "android/support/design/widget/ShadowDrawableWrapper",
-      "android/support/design/widget/StateListAnimator": "android/support/design/widget/StateListAnimator",
-      "android/support/design/animation/MotionTiming": "android/support/design/animation/MotionTiming",
-      "android/support/design/animation/ImageMatrixProperty": "android/support/design/animation/ImageMatrixProperty",
-      "android/support/design/animation/MatrixEvaluator": "android/support/design/animation/MatrixEvaluator",
-      "android/support/design/animation/AnimatorSetCompat": "android/support/design/animation/AnimatorSetCompat",
-      "android/support/design/widget/ViewOffsetBehavior": "android/support/design/widget/ViewOffsetBehavior",
-      "android/support/design/widget/HideBottomViewOnScrollBehavior": "android/support/design/widget/HideBottomViewOnScrollBehavior",
-      "android/support/design/widget/IndicatorViewController": "android/support/design/widget/IndicatorViewController",
-      "android/support/design/widget/TextInputLayout": "android/support/design/widget/TextInputLayout",
-      "android/support/v7/widget/AppCompatTextView": "androidx/appcompat/widget/AppCompatTextView",
-      "android/support/v4/widget/TextViewCompat": "androidx/core/widget/TextViewCompat",
-      "android/support/design/widget/NavigationView": "android/support/design/widget/NavigationView",
-      "android/support/v7/view/menu/MenuView": "androidx/appcompat/view/menu/MenuView",
-      "android/support/v7/view/menu/MenuItemImpl": "androidx/appcompat/view/menu/MenuItemImpl",
-      "android/support/v7/graphics/drawable/DrawableWrapper": "androidx/appcompat/graphics/drawable/DrawableWrapper",
-      "android/support/design/widget/Snackbar": "android/support/design/widget/Snackbar",
-      "android/support/design/widget/TabItem": "android/support/design/widget/TabItem",
-      "android/support/design/widget/TabLayout": "android/support/design/widget/TabLayout",
-      "android/support/v4/view/ViewPager": "androidx/viewpager/widget/ViewPager",
-      "android/support/v4/view/PagerAdapter": "androidx/viewpager/widget/PagerAdapter",
-      "android/support/v7/app/ActionBar": "androidx/appcompat/app/ActionBar",
-      "android/support/v4/view/PointerIconCompat": "androidx/core/view/PointerIconCompat",
-      "android/support/v4/view/MarginLayoutParamsCompat": "androidx/core/view/MarginLayoutParamsCompat",
-      "android/support/v7/widget/TooltipCompat": "androidx/appcompat/widget/TooltipCompat",
+      "android/support/v7/recyclerview/extensions/ListAdapter": "androidx/recyclerview/widget/ListAdapter",
+      "android/support/v7/util/AsyncListUtil": "androidx/recyclerview/widget/AsyncListUtil",
+      "android/support/v7/util/ThreadUtil": "androidx/recyclerview/widget/ThreadUtil",
+      "android/support/v7/util/TileList": "androidx/recyclerview/widget/TileList",
+      "android/support/annotation/WorkerThread": "androidx/annotation/WorkerThread",
+      "android/support/annotation/UiThread": "androidx/annotation/UiThread",
+      "android/support/v7/util/MessageThreadUtil": "androidx/recyclerview/widget/MessageThreadUtil",
+      "android/support/v7/util/BatchingListUpdateCallback": "androidx/recyclerview/widget/BatchingListUpdateCallback",
+      "android/support/annotation/VisibleForTesting": "androidx/annotation/VisibleForTesting",
+      "android/support/v7/util/SortedList": "androidx/recyclerview/widget/SortedList",
+      "android/support/v7/widget/AdapterHelper": "androidx/recyclerview/widget/AdapterHelper",
+      "android/support/v7/widget/OpReorderer": "androidx/recyclerview/widget/OpReorderer",
       "android/support/v4/util/Pools": "androidx/core/util/Pools",
-      "android/support/design/widget/TextInputEditText": "android/support/design/widget/TextInputEditText",
-      "android/support/v7/widget/AppCompatEditText": "androidx/appcompat/widget/AppCompatEditText",
-      "android/support/v7/widget/DrawableUtils": "androidx/appcompat/widget/DrawableUtils",
-      "android/support/design/bottomnavigation/LabelVisibilityMode": "android/support/design/bottomnavigation/LabelVisibilityMode",
-      "android/support/design/button/MaterialButton": "android/support/design/button/MaterialButton",
-      "android/support/v7/widget/AppCompatButton": "androidx/appcompat/widget/AppCompatButton",
-      "android/support/design/button/R": "android/support/design/button/R",
-      "android/support/design/button/MaterialButtonHelper": "android/support/design/button/MaterialButtonHelper",
-      "android/support/design/button/MaterialButtonBackgroundDrawable": "android/support/design/button/MaterialButtonBackgroundDrawable",
-      "android/support/v4/view/animation/FastOutLinearInInterpolator": "androidx/interpolator/view/animation/FastOutLinearInInterpolator",
-      "android/support/v4/view/animation/LookupTableInterpolator": "androidx/interpolator/view/animation/LookupTableInterpolator",
-      "android/support/v4/view/animation/LinearOutSlowInInterpolator": "androidx/interpolator/view/animation/LinearOutSlowInInterpolator",
-      "android/arch/lifecycle/MediatorLiveData": "androidx/lifecycle/MediatorLiveData",
-      "android/arch/lifecycle/Transformations": "androidx/lifecycle/Transformations",
-      "android/arch/core/util/Function": "androidx/arch/core/util/Function",
-      "android/databinding/adapters/AbsListViewBindingAdapter": "androidx/databinding/adapters/AbsListViewBindingAdapter",
-      "android/databinding/adapters/AbsSeekBarBindingAdapter": "androidx/databinding/adapters/AbsSeekBarBindingAdapter",
-      "android/databinding/adapters/AbsSpinnerBindingAdapter": "androidx/databinding/adapters/AbsSpinnerBindingAdapter",
-      "android/databinding/adapters/ObservableListAdapter": "androidx/databinding/adapters/ObservableListAdapter",
-      "android/databinding/adapters/ActionMenuViewBindingAdapter": "androidx/databinding/adapters/ActionMenuViewBindingAdapter",
-      "android/databinding/adapters/AdapterViewBindingAdapter": "androidx/databinding/adapters/AdapterViewBindingAdapter",
-      "android/databinding/adapters/AutoCompleteTextViewBindingAdapter": "androidx/databinding/adapters/AutoCompleteTextViewBindingAdapter",
-      "android/databinding/adapters/CalendarViewBindingAdapter": "androidx/databinding/adapters/CalendarViewBindingAdapter",
-      "android/databinding/adapters/CardViewBindingAdapter": "androidx/databinding/adapters/CardViewBindingAdapter",
-      "android/databinding/adapters/CheckedTextViewBindingAdapter": "androidx/databinding/adapters/CheckedTextViewBindingAdapter",
-      "android/databinding/adapters/ChronometerBindingAdapter": "androidx/databinding/adapters/ChronometerBindingAdapter",
-      "android/databinding/adapters/CompoundButtonBindingAdapter": "androidx/databinding/adapters/CompoundButtonBindingAdapter",
-      "android/databinding/adapters/Converters": "androidx/databinding/adapters/Converters",
-      "android/databinding/adapters/DatePickerBindingAdapter": "androidx/databinding/adapters/DatePickerBindingAdapter",
-      "android/databinding/adapters/ListenerUtil": "androidx/databinding/adapters/ListenerUtil",
-      "android/databinding/adapters/ExpandableListViewBindingAdapter": "androidx/databinding/adapters/ExpandableListViewBindingAdapter",
-      "android/databinding/adapters/FrameLayoutBindingAdapter": "androidx/databinding/adapters/FrameLayoutBindingAdapter",
-      "android/databinding/adapters/ImageViewBindingAdapter": "androidx/databinding/adapters/ImageViewBindingAdapter",
-      "android/databinding/adapters/LinearLayoutBindingAdapter": "androidx/databinding/adapters/LinearLayoutBindingAdapter",
-      "android/databinding/adapters/NumberPickerBindingAdapter": "androidx/databinding/adapters/NumberPickerBindingAdapter",
-      "android/databinding/adapters/ProgressBarBindingAdapter": "androidx/databinding/adapters/ProgressBarBindingAdapter",
-      "android/databinding/adapters/RadioGroupBindingAdapter": "androidx/databinding/adapters/RadioGroupBindingAdapter",
-      "android/databinding/adapters/RatingBarBindingAdapter": "androidx/databinding/adapters/RatingBarBindingAdapter",
-      "android/databinding/adapters/SearchViewBindingAdapter": "androidx/databinding/adapters/SearchViewBindingAdapter",
-      "android/databinding/adapters/SeekBarBindingAdapter": "androidx/databinding/adapters/SeekBarBindingAdapter",
-      "android/databinding/adapters/SpinnerBindingAdapter": "androidx/databinding/adapters/SpinnerBindingAdapter",
-      "android/databinding/adapters/SwitchBindingAdapter": "androidx/databinding/adapters/SwitchBindingAdapter",
-      "android/databinding/adapters/SwitchCompatBindingAdapter": "androidx/databinding/adapters/SwitchCompatBindingAdapter",
-      "android/support/v7/widget/SwitchCompat": "androidx/appcompat/widget/SwitchCompat",
-      "android/databinding/adapters/TabHostBindingAdapter": "androidx/databinding/adapters/TabHostBindingAdapter",
-      "android/databinding/adapters/TabWidgetBindingAdapter": "androidx/databinding/adapters/TabWidgetBindingAdapter",
-      "android/databinding/adapters/TableLayoutBindingAdapter": "androidx/databinding/adapters/TableLayoutBindingAdapter",
-      "android/databinding/adapters/TextViewBindingAdapter": "androidx/databinding/adapters/TextViewBindingAdapter",
-      "android/databinding/adapters/TimePickerBindingAdapter": "androidx/databinding/adapters/TimePickerBindingAdapter",
-      "android/databinding/adapters/ToolbarBindingAdapter": "androidx/databinding/adapters/ToolbarBindingAdapter",
-      "android/databinding/adapters/VideoViewBindingAdapter": "androidx/databinding/adapters/VideoViewBindingAdapter",
-      "android/databinding/adapters/ViewBindingAdapter": "androidx/databinding/adapters/ViewBindingAdapter",
-      "android/databinding/adapters/ViewGroupBindingAdapter": "androidx/databinding/adapters/ViewGroupBindingAdapter",
-      "android/databinding/adapters/ViewStubBindingAdapter": "androidx/databinding/adapters/ViewStubBindingAdapter",
-      "android/databinding/ViewStubProxy": "androidx/databinding/ViewStubProxy",
-      "android/databinding/adapters/ZoomControlsBindingAdapter": "androidx/databinding/adapters/ZoomControlsBindingAdapter",
+      "android/support/v7/widget/ChildHelper": "androidx/recyclerview/widget/ChildHelper",
+      "android/support/v7/widget/DefaultItemAnimator": "androidx/recyclerview/widget/DefaultItemAnimator",
+      "android/support/v7/widget/SimpleItemAnimator": "androidx/recyclerview/widget/SimpleItemAnimator",
+      "android/support/v7/widget/DividerItemDecoration": "androidx/recyclerview/widget/DividerItemDecoration",
+      "android/support/v7/widget/FastScroller": "androidx/recyclerview/widget/FastScroller",
+      "android/support/v7/widget/GapWorker": "androidx/recyclerview/widget/GapWorker",
+      "android/support/v4/os/TraceCompat": "androidx/core/os/TraceCompat",
+      "android/support/v7/widget/GridLayoutManager": "androidx/recyclerview/widget/GridLayoutManager",
+      "android/support/v7/widget/LinearLayoutManager": "androidx/recyclerview/widget/LinearLayoutManager",
+      "android/support/v7/widget/OrientationHelper": "androidx/recyclerview/widget/OrientationHelper",
+      "android/support/v7/widget/LayoutState": "androidx/recyclerview/widget/LayoutState",
+      "android/support/v7/widget/helper/ItemTouchHelper": "androidx/recyclerview/widget/ItemTouchHelper",
+      "android/support/v7/widget/LinearSmoothScroller": "androidx/recyclerview/widget/LinearSmoothScroller",
+      "android/support/v7/widget/ScrollbarHelper": "androidx/recyclerview/widget/ScrollbarHelper",
+      "android/support/v7/widget/ViewBoundsCheck": "androidx/recyclerview/widget/ViewBoundsCheck",
+      "android/support/v7/widget/LinearSnapHelper": "androidx/recyclerview/widget/LinearSnapHelper",
+      "android/support/v7/widget/SnapHelper": "androidx/recyclerview/widget/SnapHelper",
+      "android/support/v7/widget/PagerSnapHelper": "androidx/recyclerview/widget/PagerSnapHelper",
+      "android/support/v7/widget/PositionMap": "androidx/recyclerview/widget/PositionMap",
+      "android/support/v7/widget/ViewInfoStore": "androidx/recyclerview/widget/ViewInfoStore",
+      "android/support/v7/recyclerview/R": "androidx/recyclerview/R",
+      "android/support/annotation/CallSuper": "androidx/annotation/CallSuper",
+      "android/support/v7/widget/RecyclerViewAccessibilityDelegate": "androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate",
+      "android/support/v4/view/ScrollingView": "androidx/core/view/ScrollingView",
+      "android/support/v4/view/NestedScrollingChild2": "androidx/core/view/NestedScrollingChild2",
+      "android/support/v4/view/NestedScrollingChildHelper": "androidx/core/view/NestedScrollingChildHelper",
+      "android/support/v4/view/ViewConfigurationCompat": "androidx/core/view/ViewConfigurationCompat",
+      "android/support/v4/view/MotionEventCompat": "androidx/core/view/MotionEventCompat",
+      "android/support/v4/widget/EdgeEffectCompat": "androidx/core/widget/EdgeEffectCompat",
+      "android/support/v4/util/Preconditions": "androidx/core/util/Preconditions",
+      "android/support/v4/view/accessibility/AccessibilityEventCompat": "androidx/core/view/accessibility/AccessibilityEventCompat",
+      "android/support/v7/widget/StaggeredGridLayoutManager": "androidx/recyclerview/widget/StaggeredGridLayoutManager",
+      "android/support/v4/util/LongSparseArray": "androidx/collection/LongSparseArray",
+      "android/support/v4/view/GestureDetectorCompat": "androidx/core/view/GestureDetectorCompat",
+      "android/support/v7/widget/helper/ItemTouchUIUtilImpl": "androidx/recyclerview/widget/ItemTouchUIUtilImpl",
+      "android/support/v7/widget/helper/ItemTouchUIUtil": "androidx/recyclerview/widget/ItemTouchUIUtil",
+      "android/support/v7/widget/util/SortedListAdapterCallback": "androidx/recyclerview/widget/SortedListAdapterCallback",
+      "android/support/v4/print/PrintHelper": "androidx/print/PrintHelper",
+      "android/databinding/BaseObservable": "androidx/databinding/BaseObservable",
+      "android/databinding/Observable": "androidx/databinding/Observable",
+      "android/databinding/PropertyChangeRegistry": "androidx/databinding/PropertyChangeRegistry",
+      "android/databinding/BaseObservableField": "androidx/databinding/BaseObservableField",
       "android/databinding/DataBinderMapper": "androidx/databinding/DataBinderMapper",
       "android/databinding/DataBindingComponent": "androidx/databinding/DataBindingComponent",
       "android/databinding/ViewDataBinding": "androidx/databinding/ViewDataBinding",
-      "android/support/text/emoji/EmojiProcessor": "androidx/emoji/text/EmojiProcessor",
-      "android/support/text/emoji/EmojiMetadata": "androidx/emoji/text/EmojiMetadata",
-      "android/support/text/emoji/EmojiSpan": "androidx/emoji/text/EmojiSpan",
-      "android/support/text/emoji/TypefaceEmojiSpan": "androidx/emoji/text/TypefaceEmojiSpan",
-      "android/support/v4/graphics/PaintCompat": "androidx/core/graphics/PaintCompat",
-      "android/support/text/emoji/widget/SpannableBuilder": "androidx/emoji/widget/SpannableBuilder",
-      "android/support/text/emoji/FontRequestEmojiCompatConfig": "androidx/emoji/text/FontRequestEmojiCompatConfig",
-      "android/support/v4/provider/FontsContractCompat": "androidx/core/provider/FontsContractCompat",
-      "android/support/v4/provider/FontRequest": "androidx/core/provider/FontRequest",
-      "android/support/v4/graphics/TypefaceCompatUtil": "androidx/core/graphics/TypefaceCompatUtil",
-      "android/support/text/emoji/MetadataListReader": "androidx/emoji/text/MetadataListReader",
-      "android/support/text/emoji/widget/EditTextAttributeHelper": "androidx/emoji/widget/EditTextAttributeHelper",
-      "android/support/text/emoji/R": "androidx/emoji/R",
-      "android/support/text/emoji/widget/EmojiButton": "androidx/emoji/widget/EmojiButton",
-      "android/support/text/emoji/widget/EmojiTextViewHelper": "androidx/emoji/widget/EmojiTextViewHelper",
-      "android/support/text/emoji/widget/EmojiEditText": "androidx/emoji/widget/EmojiEditText",
-      "android/support/text/emoji/widget/EmojiEditTextHelper": "androidx/emoji/widget/EmojiEditTextHelper",
-      "android/support/text/emoji/widget/EmojiTextWatcher": "androidx/emoji/widget/EmojiTextWatcher",
-      "android/support/text/emoji/widget/EmojiEditableFactory": "androidx/emoji/widget/EmojiEditableFactory",
-      "android/support/text/emoji/widget/EmojiKeyListener": "androidx/emoji/widget/EmojiKeyListener",
-      "android/support/text/emoji/widget/EmojiInputConnection": "androidx/emoji/widget/EmojiInputConnection",
-      "android/support/text/emoji/widget/EmojiExtractEditText": "androidx/emoji/widget/EmojiExtractEditText",
-      "android/support/text/emoji/widget/EmojiExtractTextLayout": "androidx/emoji/widget/EmojiExtractTextLayout",
-      "android/support/text/emoji/widget/ExtractButtonCompat": "androidx/emoji/widget/ExtractButtonCompat",
-      "android/support/text/emoji/widget/EmojiInputFilter": "androidx/emoji/widget/EmojiInputFilter",
-      "android/support/text/emoji/widget/EmojiTextView": "androidx/emoji/widget/EmojiTextView",
-      "android/support/text/emoji/widget/EmojiTransformationMethod": "androidx/emoji/widget/EmojiTransformationMethod",
-      "android/arch/lifecycle/GenericLifecycleObserver": "androidx/lifecycle/GenericLifecycleObserver",
-      "android/support/v13/view/DragAndDropPermissionsCompat": "androidx/core/view/DragAndDropPermissionsCompat",
-      "android/support/v13/view/DragStartHelper": "androidx/core/view/DragStartHelper",
-      "android/support/v4/view/MotionEventCompat": "androidx/core/view/MotionEventCompat",
-      "android/support/v13/view/inputmethod/EditorInfoCompat": "androidx/core/view/inputmethod/EditorInfoCompat",
-      "android/support/v13/view/inputmethod/InputConnectionCompat": "androidx/core/view/inputmethod/InputConnectionCompat",
-      "android/support/v13/view/inputmethod/InputContentInfoCompat": "androidx/core/view/inputmethod/InputContentInfoCompat",
-      "android/support/v4/accessibilityservice/AccessibilityServiceInfoCompat": "androidx/core/accessibilityservice/AccessibilityServiceInfoCompat",
-      "android/support/v4/app/ActivityCompat": "androidx/core/app/ActivityCompat",
-      "android/support/v4/app/SharedElementCallback": "androidx/core/app/SharedElementCallback",
-      "android/support/v4/app/ActivityOptionsCompat": "androidx/core/app/ActivityOptionsCompat",
-      "android/support/v4/app/AlarmManagerCompat": "androidx/core/app/AlarmManagerCompat",
-      "android/support/v4/app/AppLaunchChecker": "androidx/core/app/AppLaunchChecker",
-      "android/support/v4/app/AppOpsManagerCompat": "androidx/core/app/AppOpsManagerCompat",
-      "android/support/v4/app/FrameMetricsAggregator": "androidx/core/app/FrameMetricsAggregator",
-      "android/support/v4/app/INotificationSideChannel": "androidx/core/app/INotificationSideChannel",
-      "android/support/v4/app/JobIntentService": "androidx/core/app/JobIntentService",
-      "android/support/v4/app/NavUtils": "androidx/core/app/NavUtils",
-      "android/support/v4/app/RemoteInput": "androidx/core/app/RemoteInput",
-      "android/support/v4/app/NotificationCompatBuilder": "androidx/core/app/NotificationCompatBuilder",
-      "android/support/compat/R": "androidx/core/R",
-      "android/support/v4/app/NotificationCompatJellybean": "androidx/core/app/NotificationCompatJellybean",
-      "android/support/v4/app/NotificationCompatExtras": "androidx/core/app/NotificationCompatExtras",
-      "android/support/v4/app/NotificationCompatSideChannelService": "androidx/core/app/NotificationCompatSideChannelService",
-      "android/support/v4/app/NotificationManagerCompat": "androidx/core/app/NotificationManagerCompat",
-      "android/support/v4/app/ServiceCompat": "androidx/core/app/ServiceCompat",
-      "android/support/v4/app/ShareCompat": "androidx/core/app/ShareCompat",
-      "android/arch/lifecycle/LifecycleRegistry": "androidx/lifecycle/LifecycleRegistry",
-      "android/arch/lifecycle/ReportFragment": "androidx/lifecycle/ReportFragment",
-      "android/support/v4/app/TaskStackBuilder": "androidx/core/app/TaskStackBuilder",
-      "android/support/v4/content/FileProvider": "androidx/core/content/FileProvider",
-      "android/support/v4/content/IntentCompat": "androidx/core/content/IntentCompat",
-      "android/support/v4/content/MimeTypeFilter": "androidx/core/content/MimeTypeFilter",
-      "android/support/v4/content/PermissionChecker": "androidx/core/content/PermissionChecker",
-      "android/support/v4/content/SharedPreferencesCompat": "androidx/core/content/SharedPreferencesCompat",
-      "android/support/v4/content/pm/ActivityInfoCompat": "androidx/core/content/pm/ActivityInfoCompat",
-      "android/support/v4/content/pm/ShortcutInfoCompat": "androidx/core/content/pm/ShortcutInfoCompat",
-      "android/support/v4/graphics/drawable/IconCompat": "androidx/core/graphics/drawable/IconCompat",
-      "android/support/v4/content/pm/ShortcutManagerCompat": "androidx/core/content/pm/ShortcutManagerCompat",
-      "android/support/v4/content/res/ConfigurationHelper": "androidx/core/content/res/ConfigurationHelper",
-      "android/support/v4/content/res/FontResourcesParserCompat": "androidx/core/content/res/FontResourcesParserCompat",
-      "android/support/v4/graphics/TypefaceCompat": "androidx/core/graphics/TypefaceCompat",
-      "android/support/v4/content/res/TypedArrayUtils": "androidx/core/content/res/TypedArrayUtils",
-      "android/support/v4/database/DatabaseUtilsCompat": "androidx/core/database/DatabaseUtilsCompat",
-      "android/support/v4/graphics/BitmapCompat": "androidx/core/graphics/BitmapCompat",
-      "android/support/v4/graphics/PathParser": "androidx/core/graphics/PathParser",
-      "android/support/v4/util/LruCache": "androidx/collection/LruCache",
-      "android/support/v4/graphics/TypefaceCompatApi28Impl": "androidx/core/graphics/TypefaceCompatApi28Impl",
-      "android/support/v4/graphics/TypefaceCompatApi26Impl": "androidx/core/graphics/TypefaceCompatApi26Impl",
-      "android/support/v4/graphics/TypefaceCompatApi24Impl": "androidx/core/graphics/TypefaceCompatApi24Impl",
-      "android/support/v4/graphics/TypefaceCompatApi21Impl": "androidx/core/graphics/TypefaceCompatApi21Impl",
-      "android/support/v4/graphics/TypefaceCompatBaseImpl": "androidx/core/graphics/TypefaceCompatBaseImpl",
-      "android/support/v4/graphics/drawable/WrappedDrawable": "androidx/core/graphics/drawable/WrappedDrawable",
-      "android/support/v4/graphics/drawable/WrappedDrawableApi21": "androidx/core/graphics/drawable/WrappedDrawableApi21",
-      "android/support/v4/graphics/drawable/WrappedDrawableApi19": "androidx/core/graphics/drawable/WrappedDrawableApi19",
-      "android/support/v4/graphics/drawable/WrappedDrawableApi14": "androidx/core/graphics/drawable/WrappedDrawableApi14",
-      "android/support/v4/graphics/drawable/RoundedBitmapDrawable": "androidx/core/graphics/drawable/RoundedBitmapDrawable",
-      "android/support/v4/graphics/drawable/RoundedBitmapDrawable21": "androidx/core/graphics/drawable/RoundedBitmapDrawable21",
-      "android/support/v4/graphics/drawable/RoundedBitmapDrawableFactory": "androidx/core/graphics/drawable/RoundedBitmapDrawableFactory",
-      "android/support/v4/hardware/display/DisplayManagerCompat": "androidx/core/hardware/display/DisplayManagerCompat",
-      "android/support/v4/hardware/fingerprint/FingerprintManagerCompat": "androidx/core/hardware/fingerprint/FingerprintManagerCompat",
-      "android/support/v4/internal/view/SupportMenu": "androidx/core/internal/view/SupportMenu",
-      "android/support/v4/internal/view/SupportMenuItem": "androidx/core/internal/view/SupportMenuItem",
-      "android/support/v4/view/ActionProvider": "androidx/core/view/ActionProvider",
-      "android/support/v4/internal/view/SupportSubMenu": "androidx/core/internal/view/SupportSubMenu",
-      "android/support/v4/math/MathUtils": "androidx/core/math/MathUtils",
-      "android/support/v4/net/ConnectivityManagerCompat": "androidx/core/net/ConnectivityManagerCompat",
-      "android/support/v4/net/DatagramSocketWrapper": "androidx/core/net/DatagramSocketWrapper",
-      "android/support/v4/net/TrafficStatsCompat": "androidx/core/net/TrafficStatsCompat",
-      "android/support/v4/os/ConfigurationCompat": "androidx/core/os/ConfigurationCompat",
-      "android/support/v4/os/LocaleListCompat": "androidx/core/os/LocaleListCompat",
-      "android/support/v4/os/EnvironmentCompat": "androidx/core/os/EnvironmentCompat",
-      "android/support/v4/os/IResultReceiver": "androidx/core/os/IResultReceiver",
-      "android/support/v4/os/LocaleHelper": "androidx/core/os/LocaleHelper",
-      "android/support/v4/os/LocaleListInterface": "androidx/core/os/LocaleListInterface",
-      "android/support/v4/os/LocaleListHelper": "androidx/core/os/LocaleListHelper",
-      "android/support/v4/os/ParcelableCompat": "androidx/core/os/ParcelableCompat",
-      "android/support/v4/os/ParcelableCompatCreatorCallbacks": "androidx/core/os/ParcelableCompatCreatorCallbacks",
-      "android/support/v4/os/TraceCompat": "androidx/core/os/TraceCompat",
-      "android/support/v4/os/UserManagerCompat": "androidx/core/os/UserManagerCompat",
-      "android/support/v4/provider/SelfDestructiveThread": "androidx/core/provider/SelfDestructiveThread",
-      "android/support/v4/text/TextUtilsCompat": "androidx/core/text/TextUtilsCompat",
-      "android/support/v4/text/ICUCompat": "androidx/core/text/ICUCompat",
-      "android/support/v4/text/util/FindAddress": "androidx/core/text/util/FindAddress",
-      "android/support/v4/text/util/LinkifyCompat": "androidx/core/text/util/LinkifyCompat",
-      "android/support/v4/util/PatternsCompat": "androidx/core/util/PatternsCompat",
-      "android/support/v4/util/AtomicFile": "androidx/core/util/AtomicFile",
-      "android/support/v4/util/LogWriter": "androidx/core/util/LogWriter",
-      "android/support/v4/view/accessibility/AccessibilityNodeProviderCompat": "androidx/core/view/accessibility/AccessibilityNodeProviderCompat",
-      "android/support/v4/view/GestureDetectorCompat": "androidx/core/view/GestureDetectorCompat",
-      "android/support/v4/view/InputDeviceCompat": "androidx/core/view/InputDeviceCompat",
-      "android/support/v4/view/LayoutInflaterCompat": "androidx/core/view/LayoutInflaterCompat",
-      "android/support/v4/view/LayoutInflaterFactory": "androidx/core/view/LayoutInflaterFactory",
-      "android/support/v4/view/MenuCompat": "androidx/core/view/MenuCompat",
-      "android/support/v4/view/MenuItemCompat": "androidx/core/view/MenuItemCompat",
-      "android/support/v4/view/NestedScrollingChild2": "androidx/core/view/NestedScrollingChild2",
-      "android/support/v4/view/ViewParentCompat": "androidx/core/view/ViewParentCompat",
-      "android/support/v4/view/NestedScrollingParent2": "androidx/core/view/NestedScrollingParent2",
-      "android/support/v4/view/ScaleGestureDetectorCompat": "androidx/core/view/ScaleGestureDetectorCompat",
-      "android/support/v4/view/ScrollingView": "androidx/core/view/ScrollingView",
-      "android/support/v4/view/VelocityTrackerCompat": "androidx/core/view/VelocityTrackerCompat",
-      "android/support/v4/view/ViewPropertyAnimatorCompat": "androidx/core/view/ViewPropertyAnimatorCompat",
-      "android/support/v4/view/ViewConfigurationCompat": "androidx/core/view/ViewConfigurationCompat",
-      "android/support/v4/view/ViewGroupCompat": "androidx/core/view/ViewGroupCompat",
-      "android/support/v4/view/ViewPropertyAnimatorListener": "androidx/core/view/ViewPropertyAnimatorListener",
-      "android/support/v4/view/ViewPropertyAnimatorUpdateListener": "androidx/core/view/ViewPropertyAnimatorUpdateListener",
-      "android/support/v4/view/ViewPropertyAnimatorListenerAdapter": "androidx/core/view/ViewPropertyAnimatorListenerAdapter",
-      "android/support/v4/view/WindowCompat": "androidx/core/view/WindowCompat",
-      "android/support/v4/view/accessibility/AccessibilityEventCompat": "androidx/core/view/accessibility/AccessibilityEventCompat",
-      "android/support/v4/view/accessibility/AccessibilityRecordCompat": "androidx/core/view/accessibility/AccessibilityRecordCompat",
-      "android/support/v4/view/accessibility/AccessibilityManagerCompat": "androidx/core/view/accessibility/AccessibilityManagerCompat",
-      "android/support/v4/view/accessibility/AccessibilityWindowInfoCompat": "androidx/core/view/accessibility/AccessibilityWindowInfoCompat",
-      "android/support/v4/view/animation/PathInterpolatorApi14": "androidx/core/view/animation/PathInterpolatorApi14",
-      "android/support/v4/view/animation/PathInterpolatorCompat": "androidx/core/view/animation/PathInterpolatorCompat",
-      "android/support/v4/widget/AutoScrollHelper": "androidx/core/widget/AutoScrollHelper",
-      "android/support/v4/widget/AutoSizeableTextView": "androidx/core/widget/AutoSizeableTextView",
-      "android/support/v4/widget/CompoundButtonCompat": "androidx/core/widget/CompoundButtonCompat",
-      "android/support/v4/widget/TintableCompoundButton": "androidx/core/widget/TintableCompoundButton",
-      "android/support/v4/widget/ContentLoadingProgressBar": "androidx/core/widget/ContentLoadingProgressBar",
-      "android/support/v4/widget/EdgeEffectCompat": "androidx/core/widget/EdgeEffectCompat",
-      "android/support/v4/widget/ImageViewCompat": "androidx/core/widget/ImageViewCompat",
-      "android/support/v4/widget/ListPopupWindowCompat": "androidx/core/widget/ListPopupWindowCompat",
-      "android/support/v4/widget/ListViewAutoScrollHelper": "androidx/core/widget/ListViewAutoScrollHelper",
-      "android/support/v4/widget/NestedScrollView": "androidx/core/widget/NestedScrollView",
-      "android/support/v4/widget/PopupMenuCompat": "androidx/core/widget/PopupMenuCompat",
-      "android/support/v4/widget/PopupWindowCompat": "androidx/core/widget/PopupWindowCompat",
-      "android/support/v4/widget/ScrollerCompat": "androidx/core/widget/ScrollerCompat",
-      "android/arch/core/internal/FastSafeIterableMap": "androidx/arch/core/internal/FastSafeIterableMap",
-      "android/arch/lifecycle/LifecycleRegistryOwner": "androidx/lifecycle/LifecycleRegistryOwner",
-      "android/support/design/transformation/ExpandableBehavior": "android/support/design/transformation/ExpandableBehavior",
-      "android/support/design/transformation/ExpandableTransformationBehavior": "android/support/design/transformation/ExpandableTransformationBehavior",
-      "android/support/design/transformation/FabTransformationBehavior": "android/support/design/transformation/FabTransformationBehavior",
-      "android/support/design/circularreveal/CircularRevealWidget": "android/support/design/circularreveal/CircularRevealWidget",
-      "android/support/design/animation/Positioning": "android/support/design/animation/Positioning",
-      "android/support/design/transformation/R": "android/support/design/transformation/R",
-      "android/support/design/animation/DrawableAlphaProperty": "android/support/design/animation/DrawableAlphaProperty",
-      "android/support/design/math/MathUtils": "android/support/design/math/MathUtils",
-      "android/support/design/circularreveal/CircularRevealCompat": "android/support/design/circularreveal/CircularRevealCompat",
-      "android/support/design/animation/ArgbEvaluatorCompat": "android/support/design/animation/ArgbEvaluatorCompat",
-      "android/support/design/circularreveal/CircularRevealHelper": "android/support/design/circularreveal/CircularRevealHelper",
-      "android/support/design/animation/ChildrenAlphaProperty": "android/support/design/animation/ChildrenAlphaProperty",
-      "android/support/design/transformation/TransformationChildLayout": "android/support/design/transformation/TransformationChildLayout",
-      "android/support/design/transformation/TransformationChildCard": "android/support/design/transformation/TransformationChildCard",
-      "android/support/design/transformation/FabTransformationScrimBehavior": "android/support/design/transformation/FabTransformationScrimBehavior",
-      "android/support/design/transformation/FabTransformationSheetBehavior": "android/support/design/transformation/FabTransformationSheetBehavior",
-      "android/support/design/circularreveal/cardview/CircularRevealCardView": "android/support/design/circularreveal/cardview/CircularRevealCardView",
-      "android/support/design/circularreveal/CircularRevealFrameLayout": "android/support/design/circularreveal/CircularRevealFrameLayout",
-      "android/support/v4/widget/CursorAdapter": "androidx/cursoradapter/widget/CursorAdapter",
-      "android/support/v4/widget/CursorFilter": "androidx/cursoradapter/widget/CursorFilter",
-      "android/support/v4/widget/ResourceCursorAdapter": "androidx/cursoradapter/widget/ResourceCursorAdapter",
-      "android/support/v4/widget/SimpleCursorAdapter": "androidx/cursoradapter/widget/SimpleCursorAdapter",
-      "android/support/design/theme/MaterialComponentsViewInflater": "android/support/design/theme/MaterialComponentsViewInflater",
-      "android/support/v7/app/AppCompatViewInflater": "androidx/appcompat/app/AppCompatViewInflater",
-      "android/databinding/BaseObservable": "androidx/databinding/BaseObservable",
-      "android/databinding/PropertyChangeRegistry": "androidx/databinding/PropertyChangeRegistry",
-      "android/databinding/BaseObservableField": "androidx/databinding/BaseObservableField",
       "android/databinding/DataBindingUtil": "androidx/databinding/DataBindingUtil",
       "android/databinding/DataBinderMapperImpl": "androidx/databinding/DataBinderMapperImpl",
       "android/databinding/ListChangeRegistry": "androidx/databinding/ListChangeRegistry",
+      "android/databinding/CallbackRegistry": "androidx/databinding/CallbackRegistry",
+      "android/databinding/ObservableList": "androidx/databinding/ObservableList",
       "android/databinding/MapChangeRegistry": "androidx/databinding/MapChangeRegistry",
+      "android/databinding/ObservableMap": "androidx/databinding/ObservableMap",
       "android/databinding/MergedDataBinderMapper": "androidx/databinding/MergedDataBinderMapper",
       "android/databinding/ObservableArrayList": "androidx/databinding/ObservableArrayList",
       "android/databinding/ObservableArrayMap": "androidx/databinding/ObservableArrayMap",
@@ -2879,33 +2405,248 @@
       "android/databinding/ObservableParcelable": "androidx/databinding/ObservableParcelable",
       "android/databinding/ObservableShort": "androidx/databinding/ObservableShort",
       "android/databinding/OnRebindCallback": "androidx/databinding/OnRebindCallback",
-      "android/support/v4/util/LongSparseArray": "androidx/collection/LongSparseArray",
-      "android/support/v4/app/BackStackRecord": "androidx/fragment/app/BackStackRecord",
-      "android/support/v4/app/Fragment": "androidx/fragment/app/Fragment",
-      "android/support/v4/app/FragmentTransaction": "androidx/fragment/app/FragmentTransaction",
+      "android/arch/lifecycle/Observer": "androidx/lifecycle/Observer",
+      "android/arch/lifecycle/LiveData": "androidx/lifecycle/LiveData",
+      "android/arch/lifecycle/LifecycleOwner": "androidx/lifecycle/LifecycleOwner",
+      "android/arch/lifecycle/LifecycleObserver": "androidx/lifecycle/LifecycleObserver",
+      "android/arch/lifecycle/Lifecycle": "androidx/lifecycle/Lifecycle",
+      "android/arch/lifecycle/OnLifecycleEvent": "androidx/lifecycle/OnLifecycleEvent",
+      "android/databinding/InverseBindingListener": "androidx/databinding/InverseBindingListener",
+      "android/support/annotation/MainThread": "androidx/annotation/MainThread",
+      "android/databinding/ViewStubProxy": "androidx/databinding/ViewStubProxy",
+      "android/support/v7/widget/CardView": "androidx/cardview/widget/CardView",
+      "android/support/v7/widget/CardViewDelegate": "androidx/cardview/widget/CardViewDelegate",
+      "android/support/v7/cardview/R": "androidx/cardview/R",
+      "android/support/v7/widget/CardViewImpl": "androidx/cardview/widget/CardViewImpl",
+      "android/support/v7/widget/CardViewApi21Impl": "androidx/cardview/widget/CardViewApi21Impl",
+      "android/support/v7/widget/CardViewApi17Impl": "androidx/cardview/widget/CardViewApi17Impl",
+      "android/support/v7/widget/CardViewBaseImpl": "androidx/cardview/widget/CardViewBaseImpl",
+      "android/support/v7/widget/RoundRectDrawableWithShadow": "androidx/cardview/widget/RoundRectDrawableWithShadow",
+      "android/support/v7/widget/RoundRectDrawable": "androidx/cardview/widget/RoundRectDrawable",
+      "android/databinding/BindingAdapter": "androidx/databinding/BindingAdapter",
+      "android/databinding/BindingMethod": "androidx/databinding/BindingMethod",
+      "android/databinding/BindingBuildInfo": "androidx/databinding/BindingBuildInfo",
+      "android/databinding/Untaggable": "androidx/databinding/Untaggable",
+      "android/databinding/InverseBindingMethod": "androidx/databinding/InverseBindingMethod",
+      "android/databinding/BindingMethods": "androidx/databinding/BindingMethods",
+      "android/databinding/BindingConversion": "androidx/databinding/BindingConversion",
+      "android/databinding/InverseBindingMethods": "androidx/databinding/InverseBindingMethods",
+      "android/databinding/InverseMethod": "androidx/databinding/InverseMethod",
+      "android/databinding/Bindable": "androidx/databinding/Bindable",
+      "android/databinding/InverseBindingAdapter": "androidx/databinding/InverseBindingAdapter",
+      "android/support/v7/view/menu/MenuView": "androidx/appcompat/view/menu/MenuView",
+      "android/support/v7/view/menu/MenuItemImpl": "androidx/appcompat/view/menu/MenuItemImpl",
+      "android/support/v7/widget/TooltipCompat": "androidx/appcompat/widget/TooltipCompat",
+      "android/support/v4/view/PointerIconCompat": "androidx/core/view/PointerIconCompat",
+      "android/support/v4/graphics/drawable/DrawableCompat": "androidx/core/graphics/drawable/DrawableCompat",
+      "android/support/annotation/StyleRes": "androidx/annotation/StyleRes",
+      "android/support/v4/widget/TextViewCompat": "androidx/core/widget/TextViewCompat",
+      "android/support/v7/view/menu/MenuBuilder": "androidx/appcompat/view/menu/MenuBuilder",
+      "android/support/v7/view/menu/MenuPresenter": "androidx/appcompat/view/menu/MenuPresenter",
+      "android/support/v7/appcompat/R": "androidx/appcompat/R",
+      "android/support/transition/TransitionSet": "androidx/transition/TransitionSet",
+      "android/support/annotation/Dimension": "androidx/annotation/Dimension",
+      "android/support/transition/AutoTransition": "androidx/transition/AutoTransition",
+      "android/support/v4/view/animation/FastOutSlowInInterpolator": "androidx/interpolator/view/animation/FastOutSlowInInterpolator",
+      "android/support/transition/Transition": "androidx/transition/Transition",
+      "android/support/v7/content/res/AppCompatResources": "androidx/appcompat/content/res/AppCompatResources",
+      "android/support/transition/TransitionManager": "androidx/transition/TransitionManager",
+      "android/support/v7/view/menu/SubMenuBuilder": "androidx/appcompat/view/menu/SubMenuBuilder",
+      "android/support/v7/widget/LinearLayoutCompat": "androidx/appcompat/widget/LinearLayoutCompat",
+      "android/support/v4/content/res/ResourcesCompat": "androidx/core/content/res/ResourcesCompat",
+      "android/support/annotation/LayoutRes": "androidx/annotation/LayoutRes",
+      "android/support/v4/view/WindowInsetsCompat": "androidx/core/view/WindowInsetsCompat",
+      "android/support/v4/view/OnApplyWindowInsetsListener": "androidx/core/view/OnApplyWindowInsetsListener",
+      "android/support/design/snackbar/ContentViewCallback": "android/support/design/snackbar/ContentViewCallback",
+      "android/support/transition/TransitionValues": "androidx/transition/TransitionValues",
+      "android/support/annotation/StyleableRes": "androidx/annotation/StyleableRes",
+      "android/support/annotation/AttrRes": "androidx/annotation/AttrRes",
+      "android/support/v7/widget/TintTypedArray": "androidx/appcompat/widget/TintTypedArray",
+      "android/support/v4/widget/ExploreByTouchHelper": "androidx/customview/widget/ExploreByTouchHelper",
+      "android/support/v4/widget/FocusStrategy": "androidx/customview/widget/FocusStrategy",
+      "android/support/v4/util/SparseArrayCompat": "androidx/collection/SparseArrayCompat",
+      "android/support/v4/view/accessibility/AccessibilityNodeProviderCompat": "androidx/core/view/accessibility/AccessibilityNodeProviderCompat",
+      "android/support/v4/view/ViewParentCompat": "androidx/core/view/ViewParentCompat",
+      "android/support/v4/view/accessibility/AccessibilityRecordCompat": "androidx/core/view/accessibility/AccessibilityRecordCompat",
+      "android/arch/persistence/room/migration/bundle/DatabaseBundle": "androidx/room/migration/bundle/DatabaseBundle",
+      "android/arch/persistence/room/migration/bundle/SchemaEquality": "androidx/room/migration/bundle/SchemaEquality",
+      "android/arch/persistence/room/migration/bundle/EntityBundle": "androidx/room/migration/bundle/EntityBundle",
+      "android/arch/persistence/room/migration/bundle/SchemaEqualityUtil": "androidx/room/migration/bundle/SchemaEqualityUtil",
+      "android/arch/persistence/room/migration/bundle/FieldBundle": "androidx/room/migration/bundle/FieldBundle",
+      "android/arch/persistence/room/migration/bundle/IndexBundle": "androidx/room/migration/bundle/IndexBundle",
+      "android/arch/persistence/room/migration/bundle/BundleUtil": "androidx/room/migration/bundle/BundleUtil",
+      "android/arch/persistence/room/migration/bundle/PrimaryKeyBundle": "androidx/room/migration/bundle/PrimaryKeyBundle",
+      "android/arch/persistence/room/migration/bundle/ForeignKeyBundle": "androidx/room/migration/bundle/ForeignKeyBundle",
+      "android/arch/persistence/room/migration/bundle/SchemaBundle": "androidx/room/migration/bundle/SchemaBundle",
+      "android/support/v17/internal/widget/OutlineOnlyWithChildrenFrameLayout": "androidx/leanback/preference/internal/OutlineOnlyWithChildrenFrameLayout",
+      "android/support/v17/preference/BaseLeanbackPreferenceFragment": "androidx/leanback/preference/BaseLeanbackPreferenceFragment",
+      "android/support/v14/preference/PreferenceFragment": "androidx/preference/PreferenceFragment",
+      "android/support/v17/preference/R": "androidx/leanback/preference/R",
+      "android/support/v17/leanback/widget/VerticalGridView": "androidx/leanback/widget/VerticalGridView",
+      "android/support/v7/preference/PreferenceRecyclerViewAccessibilityDelegate": "androidx/preference/PreferenceRecyclerViewAccessibilityDelegate",
+      "android/support/v17/preference/LeanbackListPreferenceDialogFragment": "androidx/leanback/preference/LeanbackListPreferenceDialogFragment",
+      "android/support/v7/preference/DialogPreference": "androidx/preference/DialogPreference",
+      "android/support/v14/preference/MultiSelectListPreference": "androidx/preference/MultiSelectListPreference",
+      "android/support/v7/preference/ListPreference": "androidx/preference/ListPreference",
+      "android/support/v17/preference/LeanbackPreferenceDialogFragment": "androidx/leanback/preference/LeanbackPreferenceDialogFragment",
+      "android/support/v4/util/ArraySet": "androidx/collection/ArraySet",
+      "android/support/v17/preference/LeanbackPreferenceFragmentTransitionHelperApi21": "androidx/leanback/preference/LeanbackPreferenceFragmentTransitionHelperApi21",
+      "android/support/v7/preference/Preference": "androidx/preference/Preference",
+      "android/support/v17/preference/LeanbackPreferenceFragment": "androidx/leanback/preference/LeanbackPreferenceFragment",
+      "android/support/v7/preference/PreferenceScreen": "androidx/preference/PreferenceScreen",
+      "android/support/v17/leanback/transition/FadeAndShortSlide": "androidx/leanback/transition/FadeAndShortSlide",
+      "android/support/v17/preference/LeanbackSettingsFragment": "androidx/leanback/preference/LeanbackSettingsFragment",
+      "android/support/v17/preference/LeanbackSettingsRootView": "androidx/leanback/preference/LeanbackSettingsRootView",
+      "android/support/v4/view/animation/FastOutLinearInInterpolator": "androidx/interpolator/view/animation/FastOutLinearInInterpolator",
+      "android/support/v4/view/animation/LookupTableInterpolator": "androidx/interpolator/view/animation/LookupTableInterpolator",
+      "android/support/v4/view/animation/LinearOutSlowInInterpolator": "androidx/interpolator/view/animation/LinearOutSlowInInterpolator",
+      "android/support/v7/app/MediaRouteActionProvider": "androidx/mediarouter/app/MediaRouteActionProvider",
+      "android/support/v7/media/MediaRouter": "androidx/mediarouter/media/MediaRouter",
+      "android/support/v4/view/ActionProvider": "androidx/core/view/ActionProvider",
+      "android/support/v7/media/MediaRouteSelector": "androidx/mediarouter/media/MediaRouteSelector",
+      "android/support/v7/app/MediaRouteDialogFactory": "androidx/mediarouter/app/MediaRouteDialogFactory",
+      "android/support/v7/app/MediaRouteButton": "androidx/mediarouter/app/MediaRouteButton",
+      "android/support/v7/mediarouter/R": "androidx/mediarouter/R",
+      "android/support/v7/app/MediaRouterThemeHelper": "androidx/mediarouter/app/MediaRouterThemeHelper",
       "android/support/v4/app/FragmentManager": "androidx/fragment/app/FragmentManager",
-      "android/support/v4/app/FragmentManagerImpl": "androidx/fragment/app/FragmentManagerImpl",
-      "android/support/v4/app/FragmentHostCallback": "androidx/fragment/app/FragmentHostCallback",
-      "android/support/v4/app/FragmentTransition": "androidx/fragment/app/FragmentTransition",
-      "android/support/v4/app/BackStackState": "androidx/fragment/app/BackStackState",
-      "android/support/v4/app/BaseFragmentActivityApi14": "androidx/fragment/app/BaseFragmentActivityApi14",
-      "android/support/v4/app/BaseFragmentActivityApi16": "androidx/fragment/app/BaseFragmentActivityApi16",
-      "android/support/v4/app/DialogFragment": "androidx/fragment/app/DialogFragment",
+      "android/support/v4/app/Fragment": "androidx/fragment/app/Fragment",
+      "android/support/v7/app/MediaRouteChooserDialogFragment": "androidx/mediarouter/app/MediaRouteChooserDialogFragment",
+      "android/support/v7/app/MediaRouteControllerDialogFragment": "androidx/mediarouter/app/MediaRouteControllerDialogFragment",
       "android/support/v4/app/FragmentActivity": "androidx/fragment/app/FragmentActivity",
-      "android/support/v4/app/FragmentContainer": "androidx/fragment/app/FragmentContainer",
-      "android/support/v4/app/FragmentManagerNonConfig": "androidx/fragment/app/FragmentManagerNonConfig",
-      "android/support/v4/app/SuperNotCalledException": "androidx/fragment/app/SuperNotCalledException",
-      "android/support/v4/app/FragmentController": "androidx/fragment/app/FragmentController",
-      "android/support/v4/app/FragmentState": "androidx/fragment/app/FragmentState",
-      "android/support/v4/app/FragmentManagerState": "androidx/fragment/app/FragmentManagerState",
-      "android/support/v4/app/FragmentPagerAdapter": "androidx/fragment/app/FragmentPagerAdapter",
-      "android/support/v4/app/FragmentStatePagerAdapter": "androidx/fragment/app/FragmentStatePagerAdapter",
-      "android/support/v4/app/FragmentTabHost": "androidx/fragment/app/FragmentTabHost",
-      "android/support/v4/app/FragmentTransitionImpl": "androidx/fragment/app/FragmentTransitionImpl",
-      "android/support/v4/app/OneShotPreDrawListener": "androidx/fragment/app/OneShotPreDrawListener",
-      "android/support/v4/app/FragmentTransitionCompat21": "androidx/fragment/app/FragmentTransitionCompat21",
-      "android/support/v4/app/ListFragment": "androidx/fragment/app/ListFragment",
-      "android/support/v4/widget/SlidingPaneLayout": "androidx/slidingpanelayout/widget/SlidingPaneLayout",
+      "android/support/v7/app/MediaRouteChooserDialog": "androidx/mediarouter/app/MediaRouteChooserDialog",
+      "android/support/v7/app/AppCompatDialog": "androidx/appcompat/app/AppCompatDialog",
+      "android/support/v7/app/MediaRouteDialogHelper": "androidx/mediarouter/app/MediaRouteDialogHelper",
+      "android/support/v4/app/DialogFragment": "androidx/fragment/app/DialogFragment",
+      "android/support/v7/app/MediaRouteControllerDialog": "androidx/mediarouter/app/MediaRouteControllerDialog",
+      "android/support/v7/app/OverlayListView": "androidx/mediarouter/app/OverlayListView",
+      "android/support/v7/graphics/Palette": "androidx/palette/graphics/Palette",
+      "android/support/v4/util/ObjectsCompat": "androidx/core/util/ObjectsCompat",
+      "android/support/v7/app/MediaRouteVolumeSlider": "androidx/mediarouter/app/MediaRouteVolumeSlider",
+      "android/support/v7/app/AlertDialog": "androidx/appcompat/app/AlertDialog",
+      "android/support/v7/app/MediaRouteExpandCollapseButton": "androidx/mediarouter/app/MediaRouteExpandCollapseButton",
+      "android/support/v7/app/MediaRouteDiscoveryFragment": "androidx/mediarouter/app/MediaRouteDiscoveryFragment",
+      "android/support/v7/widget/AppCompatSeekBar": "androidx/appcompat/widget/AppCompatSeekBar",
+      "android/support/v4/graphics/ColorUtils": "androidx/core/graphics/ColorUtils",
+      "android/support/v7/media/MediaControlIntent": "androidx/mediarouter/media/MediaControlIntent",
+      "android/support/v7/media/MediaItemMetadata": "androidx/mediarouter/media/MediaItemMetadata",
+      "android/support/v7/media/MediaItemStatus": "androidx/mediarouter/media/MediaItemStatus",
+      "android/support/v4/util/TimeUtils": "androidx/core/util/TimeUtils",
+      "android/support/v7/media/MediaRouteDescriptor": "androidx/mediarouter/media/MediaRouteDescriptor",
+      "android/support/v7/media/MediaRouteDiscoveryRequest": "androidx/mediarouter/media/MediaRouteDiscoveryRequest",
+      "android/support/v7/media/MediaRouteProvider": "androidx/mediarouter/media/MediaRouteProvider",
+      "android/support/v7/media/MediaRouteProviderDescriptor": "androidx/mediarouter/media/MediaRouteProviderDescriptor",
+      "android/support/v7/media/MediaRouteProviderProtocol": "androidx/mediarouter/media/MediaRouteProviderProtocol",
+      "android/support/v7/media/MediaRouteProviderService": "androidx/mediarouter/media/MediaRouteProviderService",
+      "android/support/v7/media/SystemMediaRouteProvider": "androidx/mediarouter/media/SystemMediaRouteProvider",
+      "android/support/v7/media/RemoteControlClientCompat": "androidx/mediarouter/media/RemoteControlClientCompat",
+      "android/support/v7/media/RegisteredMediaRouteProviderWatcher": "androidx/mediarouter/media/RegisteredMediaRouteProviderWatcher",
+      "android/support/v4/hardware/display/DisplayManagerCompat": "androidx/core/hardware/display/DisplayManagerCompat",
+      "android/support/v4/app/ActivityManagerCompat": "androidx/core/app/ActivityManagerCompat",
+      "android/support/v7/media/MediaRouterApi24": "androidx/mediarouter/media/MediaRouterApi24",
+      "android/support/v7/media/MediaRouterJellybean": "androidx/mediarouter/media/MediaRouterJellybean",
+      "android/support/v7/media/MediaRouterJellybeanMr1": "androidx/mediarouter/media/MediaRouterJellybeanMr1",
+      "android/support/v7/media/MediaRouterJellybeanMr2": "androidx/mediarouter/media/MediaRouterJellybeanMr2",
+      "android/support/v7/media/MediaSessionStatus": "androidx/mediarouter/media/MediaSessionStatus",
+      "android/support/v7/media/RegisteredMediaRouteProvider": "androidx/mediarouter/media/RegisteredMediaRouteProvider",
+      "android/support/v7/media/RemotePlaybackClient": "androidx/mediarouter/media/RemotePlaybackClient",
+      "android/support/text/emoji/bundled/BundledEmojiCompatConfig": "androidx/emoji/bundled/BundledEmojiCompatConfig",
+      "android/support/text/emoji/EmojiCompat": "androidx/emoji/text/EmojiCompat",
+      "android/support/text/emoji/MetadataRepo": "androidx/emoji/text/MetadataRepo",
+      "android/support/v4/provider/DocumentFile": "androidx/documentfile/provider/DocumentFile",
+      "android/support/v4/provider/RawDocumentFile": "androidx/documentfile/provider/RawDocumentFile",
+      "android/support/v4/provider/SingleDocumentFile": "androidx/documentfile/provider/SingleDocumentFile",
+      "android/support/v4/provider/TreeDocumentFile": "androidx/documentfile/provider/TreeDocumentFile",
+      "android/support/v4/provider/DocumentsContractApi19": "androidx/documentfile/provider/DocumentsContractApi19",
+      "android/support/graphics/drawable/AndroidResources": "androidx/vectordrawable/graphics/drawable/AndroidResources",
+      "android/support/graphics/drawable/VectorDrawableCommon": "androidx/vectordrawable/graphics/drawable/VectorDrawableCommon",
+      "android/support/v4/graphics/drawable/TintAwareDrawable": "androidx/core/graphics/drawable/TintAwareDrawable",
+      "android/support/graphics/drawable/VectorDrawableCompat": "androidx/vectordrawable/graphics/drawable/VectorDrawableCompat",
+      "android/support/v4/graphics/PathParser": "androidx/core/graphics/PathParser",
+      "android/support/v4/content/res/TypedArrayUtils": "androidx/core/content/res/TypedArrayUtils",
+      "android/support/design/card/MaterialCardView": "android/support/design/card/MaterialCardView",
+      "android/support/design/card/R": "android/support/design/card/R",
+      "android/support/design/card/MaterialCardViewHelper": "android/support/design/card/MaterialCardViewHelper",
+      "android/support/v4/os/BuildCompat": "androidx/core/os/BuildCompat",
+      "android/support/design/widget/AppBarLayout": "android/support/design/widget/AppBarLayout",
+      "android/support/design/widget/CoordinatorLayout": "androidx/coordinatorlayout/widget/CoordinatorLayout",
+      "android/support/design/widget/HeaderBehavior": "android/support/design/widget/HeaderBehavior",
+      "android/support/design/animation/AnimationUtils": "android/support/design/animation/AnimationUtils",
+      "android/support/design/widget/MathUtils": "android/support/design/widget/MathUtils",
+      "android/support/design/widget/R": "android/support/design/widget/R",
+      "android/support/design/widget/HeaderScrollingViewBehavior": "android/support/design/widget/HeaderScrollingViewBehavior",
+      "android/support/design/widget/ViewUtilsLollipop": "android/support/design/widget/ViewUtilsLollipop",
+      "android/support/design/widget/BaseTransientBottomBar": "android/support/design/widget/BaseTransientBottomBar",
+      "android/support/design/widget/SnackbarManager": "android/support/design/widget/SnackbarManager",
+      "android/support/design/widget/SwipeDismissBehavior": "android/support/design/widget/SwipeDismissBehavior",
+      "android/support/annotation/IntRange": "androidx/annotation/IntRange",
+      "android/support/design/widget/BottomNavigationView": "android/support/design/widget/BottomNavigationView",
+      "android/support/annotation/DimenRes": "androidx/annotation/DimenRes",
+      "android/support/annotation/IdRes": "androidx/annotation/IdRes",
+      "android/support/annotation/IntegerRes": "androidx/annotation/IntegerRes",
+      "android/support/annotation/BoolRes": "androidx/annotation/BoolRes",
+      "android/support/v7/view/SupportMenuInflater": "androidx/appcompat/view/SupportMenuInflater",
+      "android/support/design/widget/BottomSheetBehavior": "android/support/design/widget/BottomSheetBehavior",
+      "android/support/design/widget/BottomSheetDialog": "android/support/design/widget/BottomSheetDialog",
+      "android/support/design/widget/BottomSheetDialogFragment": "android/support/design/widget/BottomSheetDialogFragment",
+      "android/support/v7/app/AppCompatDialogFragment": "androidx/appcompat/app/AppCompatDialogFragment",
+      "android/support/design/widget/CheckableImageButton": "android/support/design/widget/CheckableImageButton",
+      "android/support/v7/widget/AppCompatImageButton": "androidx/appcompat/widget/AppCompatImageButton",
+      "android/support/design/widget/CircularBorderDrawable": "android/support/design/widget/CircularBorderDrawable",
+      "android/support/design/widget/CircularBorderDrawableLollipop": "android/support/design/widget/CircularBorderDrawableLollipop",
+      "android/support/design/widget/CollapsingTextHelper": "android/support/design/widget/CollapsingTextHelper",
+      "android/support/v4/view/GravityCompat": "androidx/core/view/GravityCompat",
+      "android/support/v4/text/TextDirectionHeuristicsCompat": "androidx/core/text/TextDirectionHeuristicsCompat",
+      "android/support/v4/text/TextDirectionHeuristicCompat": "androidx/core/text/TextDirectionHeuristicCompat",
+      "android/support/design/widget/CollapsingToolbarLayout": "android/support/design/widget/CollapsingToolbarLayout",
+      "android/support/design/widget/ViewOffsetHelper": "android/support/design/widget/ViewOffsetHelper",
+      "android/support/v7/widget/Toolbar": "androidx/appcompat/widget/Toolbar",
+      "android/support/design/widget/DescendantOffsetUtils": "android/support/design/widget/DescendantOffsetUtils",
+      "android/support/design/widget/CutoutDrawable": "android/support/design/widget/CutoutDrawable",
+      "android/support/design/widget/DrawableUtils": "android/support/design/widget/DrawableUtils",
+      "android/support/design/widget/FloatingActionButton": "android/support/design/widget/FloatingActionButton",
+      "android/support/design/widget/FloatingActionButtonImpl": "android/support/design/widget/FloatingActionButtonImpl",
+      "android/support/design/widget/ShadowViewDelegate": "android/support/design/widget/ShadowViewDelegate",
+      "android/support/design/widget/VisibilityAwareImageButton": "android/support/design/widget/VisibilityAwareImageButton",
+      "android/support/v4/view/TintableBackgroundView": "androidx/core/view/TintableBackgroundView",
+      "android/support/v4/widget/TintableImageSourceView": "androidx/core/widget/TintableImageSourceView",
+      "android/support/design/expandable/ExpandableTransformationWidget": "android/support/design/expandable/ExpandableTransformationWidget",
+      "android/support/v7/widget/AppCompatImageHelper": "androidx/appcompat/widget/AppCompatImageHelper",
+      "android/support/design/expandable/ExpandableWidgetHelper": "android/support/design/expandable/ExpandableWidgetHelper",
+      "android/support/design/resources/MaterialResources": "android/support/design/resources/MaterialResources",
+      "android/support/design/animation/MotionSpec": "android/support/design/animation/MotionSpec",
+      "android/support/design/expandable/ExpandableWidget": "android/support/design/expandable/ExpandableWidget",
+      "android/support/v7/widget/AppCompatDrawableManager": "androidx/appcompat/widget/AppCompatDrawableManager",
+      "android/support/design/stateful/ExtendableSavedState": "android/support/design/stateful/ExtendableSavedState",
+      "android/support/v4/util/SimpleArrayMap": "androidx/collection/SimpleArrayMap",
+      "android/support/annotation/AnimatorRes": "androidx/annotation/AnimatorRes",
+      "android/support/design/widget/FloatingActionButtonImplLollipop": "android/support/design/widget/FloatingActionButtonImplLollipop",
+      "android/support/design/widget/ShadowDrawableWrapper": "android/support/design/widget/ShadowDrawableWrapper",
+      "android/support/design/widget/StateListAnimator": "android/support/design/widget/StateListAnimator",
+      "android/support/design/ripple/RippleUtils": "android/support/design/ripple/RippleUtils",
+      "android/support/design/animation/MotionTiming": "android/support/design/animation/MotionTiming",
+      "android/support/design/animation/ImageMatrixProperty": "android/support/design/animation/ImageMatrixProperty",
+      "android/support/design/animation/MatrixEvaluator": "android/support/design/animation/MatrixEvaluator",
+      "android/support/design/animation/AnimatorSetCompat": "android/support/design/animation/AnimatorSetCompat",
+      "android/support/design/widget/ViewOffsetBehavior": "android/support/design/widget/ViewOffsetBehavior",
+      "android/support/design/widget/HideBottomViewOnScrollBehavior": "android/support/design/widget/HideBottomViewOnScrollBehavior",
+      "android/support/design/widget/IndicatorViewController": "android/support/design/widget/IndicatorViewController",
+      "android/support/design/widget/TextInputLayout": "android/support/design/widget/TextInputLayout",
+      "android/support/v4/widget/Space": "androidx/legacy/widget/Space",
+      "android/support/v7/widget/AppCompatTextView": "androidx/appcompat/widget/AppCompatTextView",
+      "android/support/design/widget/NavigationView": "android/support/design/widget/NavigationView",
+      "android/support/v7/graphics/drawable/DrawableWrapper": "androidx/appcompat/graphics/drawable/DrawableWrapper",
+      "android/support/design/widget/Snackbar": "android/support/design/widget/Snackbar",
+      "android/support/annotation/StringRes": "androidx/annotation/StringRes",
+      "android/support/design/widget/TabItem": "android/support/design/widget/TabItem",
+      "android/support/design/widget/TabLayout": "android/support/design/widget/TabLayout",
+      "android/support/v4/view/ViewPager": "androidx/viewpager/widget/ViewPager",
+      "android/support/v4/view/PagerAdapter": "androidx/viewpager/widget/PagerAdapter",
+      "android/support/v7/app/ActionBar": "androidx/appcompat/app/ActionBar",
+      "android/support/v4/view/MarginLayoutParamsCompat": "androidx/core/view/MarginLayoutParamsCompat",
+      "android/support/annotation/ColorRes": "androidx/annotation/ColorRes",
+      "android/support/design/widget/TextInputEditText": "android/support/design/widget/TextInputEditText",
+      "android/support/v7/widget/AppCompatEditText": "androidx/appcompat/widget/AppCompatEditText",
+      "android/support/v7/widget/DrawableUtils": "androidx/appcompat/widget/DrawableUtils",
       "android/support/v17/leanback/animation/LogAccelerateInterpolator": "androidx/leanback/animation/LogAccelerateInterpolator",
       "android/support/v17/leanback/animation/LogDecelerateInterpolator": "androidx/leanback/animation/LogDecelerateInterpolator",
       "android/support/v17/leanback/app/BackgroundFragment": "androidx/leanback/app/BackgroundFragment",
@@ -2922,7 +2663,6 @@
       "android/support/v17/leanback/app/BaseRowFragment": "androidx/leanback/app/BaseRowFragment",
       "android/support/v17/leanback/widget/OnChildViewHolderSelectedListener": "androidx/leanback/widget/OnChildViewHolderSelectedListener",
       "android/support/v17/leanback/widget/ItemBridgeAdapter": "androidx/leanback/widget/ItemBridgeAdapter",
-      "android/support/v17/leanback/widget/VerticalGridView": "androidx/leanback/widget/VerticalGridView",
       "android/support/v17/leanback/widget/ObjectAdapter": "androidx/leanback/widget/ObjectAdapter",
       "android/support/v17/leanback/widget/PresenterSelector": "androidx/leanback/widget/PresenterSelector",
       "android/support/v17/leanback/widget/Row": "androidx/leanback/widget/Row",
@@ -2948,6 +2688,7 @@
       "android/support/v17/leanback/widget/InvisibleRowPresenter": "androidx/leanback/widget/InvisibleRowPresenter",
       "android/support/v17/leanback/app/BrowseSupportFragment": "androidx/leanback/app/BrowseSupportFragment",
       "android/support/v17/leanback/app/HeadersSupportFragment": "androidx/leanback/app/HeadersSupportFragment",
+      "android/support/v4/app/FragmentTransaction": "androidx/fragment/app/FragmentTransaction",
       "android/support/v17/leanback/app/RowsSupportFragment": "androidx/leanback/app/RowsSupportFragment",
       "android/support/v17/leanback/app/DetailsBackgroundVideoHelper": "androidx/leanback/app/DetailsBackgroundVideoHelper",
       "android/support/v17/leanback/widget/ParallaxTarget": "androidx/leanback/widget/ParallaxTarget",
@@ -2981,6 +2722,7 @@
       "android/support/v17/leanback/widget/DiffCallback": "androidx/leanback/widget/DiffCallback",
       "android/support/v17/leanback/app/GuidedStepRootLayout": "androidx/leanback/app/GuidedStepRootLayout",
       "android/support/v17/leanback/widget/NonOverlappingLinearLayout": "androidx/leanback/widget/NonOverlappingLinearLayout",
+      "android/support/v4/app/ActivityCompat": "androidx/core/app/ActivityCompat",
       "android/support/v17/leanback/widget/Util": "androidx/leanback/widget/Util",
       "android/support/v17/leanback/app/GuidedStepSupportFragment": "androidx/leanback/app/GuidedStepSupportFragment",
       "android/support/v17/leanback/widget/FocusHighlightHelper": "androidx/leanback/widget/FocusHighlightHelper",
@@ -3038,7 +2780,6 @@
       "android/support/v17/leanback/widget/PlaybackTransportRowPresenter": "androidx/leanback/widget/PlaybackTransportRowPresenter",
       "android/support/v17/leanback/system/Settings": "androidx/leanback/system/Settings",
       "android/support/v17/leanback/widget/ShadowOverlayContainer": "androidx/leanback/widget/ShadowOverlayContainer",
-      "android/support/v17/leanback/transition/FadeAndShortSlide": "androidx/leanback/transition/FadeAndShortSlide",
       "android/support/v17/leanback/transition/TranslationAnimationCreator": "androidx/leanback/transition/TranslationAnimationCreator",
       "android/support/v17/leanback/transition/LeanbackTransitionHelper": "androidx/leanback/transition/LeanbackTransitionHelper",
       "android/support/v17/leanback/transition/LeanbackTransitionHelperKitKat": "androidx/leanback/transition/LeanbackTransitionHelperKitKat",
@@ -3058,7 +2799,6 @@
       "android/support/v17/leanback/widget/BaseCardView": "androidx/leanback/widget/BaseCardView",
       "android/support/v17/leanback/widget/GridLayoutManager": "androidx/leanback/widget/GridLayoutManager",
       "android/support/v17/leanback/widget/WindowAlignment": "androidx/leanback/widget/WindowAlignment",
-      "android/support/v7/widget/SimpleItemAnimator": "androidx/recyclerview/widget/SimpleItemAnimator",
       "android/support/v17/leanback/widget/OnChildSelectedListener": "androidx/leanback/widget/OnChildSelectedListener",
       "android/support/v17/leanback/widget/ViewsStateBundle": "androidx/leanback/widget/ViewsStateBundle",
       "android/support/v17/leanback/widget/BrowseRowsFrameLayout": "androidx/leanback/widget/BrowseRowsFrameLayout",
@@ -3072,6 +2812,7 @@
       "android/support/v17/leanback/widget/DetailsOverviewRowPresenter": "androidx/leanback/widget/DetailsOverviewRowPresenter",
       "android/support/v17/leanback/widget/DetailsOverviewSharedElementHelper": "androidx/leanback/widget/DetailsOverviewSharedElementHelper",
       "android/support/v17/leanback/widget/RoundedRectHelper": "androidx/leanback/widget/RoundedRectHelper",
+      "android/support/v4/app/SharedElementCallback": "androidx/core/app/SharedElementCallback",
       "android/support/v17/leanback/widget/RecyclerViewParallax": "androidx/leanback/widget/RecyclerViewParallax",
       "android/support/v17/leanback/widget/FacetProvider": "androidx/leanback/widget/FacetProvider",
       "android/support/v17/leanback/widget/FacetProviderAdapter": "androidx/leanback/widget/FacetProviderAdapter",
@@ -3085,10 +2826,8 @@
       "android/support/v4/util/CircularIntArray": "androidx/collection/CircularIntArray",
       "android/support/v17/leanback/widget/SingleRow": "androidx/leanback/widget/SingleRow",
       "android/support/v17/leanback/widget/StaggeredGridDefault": "androidx/leanback/widget/StaggeredGridDefault",
-      "android/support/v7/widget/LinearSmoothScroller": "androidx/recyclerview/widget/LinearSmoothScroller",
       "android/support/v17/leanback/widget/ItemAlignmentFacetHelper": "androidx/leanback/widget/ItemAlignmentFacetHelper",
       "android/support/v17/leanback/widget/ItemAlignment": "androidx/leanback/widget/ItemAlignment",
-      "android/support/v7/widget/OrientationHelper": "androidx/recyclerview/widget/OrientationHelper",
       "android/support/v17/leanback/widget/GuidanceStylingRelativeLayout": "androidx/leanback/widget/GuidanceStylingRelativeLayout",
       "android/support/v17/leanback/widget/ImeKeyMonitor": "androidx/leanback/widget/ImeKeyMonitor",
       "android/support/v17/leanback/widget/GuidedActionDiffCallback": "androidx/leanback/widget/GuidedActionDiffCallback",
@@ -3131,131 +2870,29 @@
       "android/support/v4/util/CircularArray": "androidx/collection/CircularArray",
       "android/support/v17/leanback/widget/TitleView": "androidx/leanback/widget/TitleView",
       "android/support/v17/leanback/widget/VideoSurfaceView": "androidx/leanback/widget/VideoSurfaceView",
+      "android/support/v4/util/LruCache": "androidx/collection/LruCache",
       "android/support/v17/leanback/widget/Visibility": "androidx/leanback/widget/Visibility",
       "android/support/v17/leanback/widget/picker/Picker": "androidx/leanback/widget/picker/Picker",
       "android/support/v17/leanback/widget/picker/PickerUtility": "androidx/leanback/widget/picker/PickerUtility",
       "android/support/v17/leanback/widget/picker/PickerColumn": "androidx/leanback/widget/picker/PickerColumn",
       "android/support/v17/leanback/widget/picker/TimePicker": "androidx/leanback/widget/picker/TimePicker",
-      "android/support/v4/provider/DocumentFile": "androidx/documentfile/provider/DocumentFile",
-      "android/support/v4/provider/RawDocumentFile": "androidx/documentfile/provider/RawDocumentFile",
-      "android/support/v4/provider/SingleDocumentFile": "androidx/documentfile/provider/SingleDocumentFile",
-      "android/support/v4/provider/TreeDocumentFile": "androidx/documentfile/provider/TreeDocumentFile",
-      "android/support/v4/provider/DocumentsContractApi19": "androidx/documentfile/provider/DocumentsContractApi19",
-      "android/arch/lifecycle/EmptyActivityLifecycleCallbacks": "androidx/lifecycle/EmptyActivityLifecycleCallbacks",
-      "android/arch/lifecycle/HolderFragment": "androidx/lifecycle/HolderFragment",
-      "android/arch/lifecycle/LifecycleDispatcher": "androidx/lifecycle/LifecycleDispatcher",
-      "android/arch/lifecycle/LifecycleService": "androidx/lifecycle/LifecycleService",
-      "android/arch/lifecycle/ServiceLifecycleDispatcher": "androidx/lifecycle/ServiceLifecycleDispatcher",
-      "android/arch/lifecycle/ProcessLifecycleOwner": "androidx/lifecycle/ProcessLifecycleOwner",
-      "android/arch/lifecycle/ProcessLifecycleOwnerInitializer": "androidx/lifecycle/ProcessLifecycleOwnerInitializer",
-      "android/arch/lifecycle/ViewModelProviders": "androidx/lifecycle/ViewModelProviders",
-      "android/arch/lifecycle/ViewModelStores": "androidx/lifecycle/ViewModelStores",
-      "android/arch/persistence/room/testing/MigrationTestHelper": "androidx/room/testing/MigrationTestHelper",
-      "android/support/wear/ambient/AmbientDelegate": "androidx/wear/ambient/AmbientDelegate",
-      "android/support/wear/ambient/WearableControllerProvider": "androidx/wear/ambient/WearableControllerProvider",
-      "android/support/wear/ambient/AmbientMode": "androidx/wear/ambient/AmbientMode",
-      "android/support/wear/ambient/AmbientModeSupport": "androidx/wear/ambient/AmbientModeSupport",
-      "android/support/wear/ambient/SharedLibraryVersion": "androidx/wear/ambient/SharedLibraryVersion",
-      "android/support/wear/internal/widget/ResourcesUtil": "androidx/wear/internal/widget/ResourcesUtil",
-      "android/support/wear/internal/widget/drawer/MultiPagePresenter": "androidx/wear/internal/widget/drawer/MultiPagePresenter",
-      "android/support/wear/widget/drawer/WearableNavigationDrawerView": "androidx/wear/widget/drawer/WearableNavigationDrawerView",
-      "android/support/wear/internal/widget/drawer/WearableNavigationDrawerPresenter": "androidx/wear/internal/widget/drawer/WearableNavigationDrawerPresenter",
-      "android/support/wear/widget/drawer/WearableDrawerController": "androidx/wear/widget/drawer/WearableDrawerController",
-      "android/support/wear/internal/widget/drawer/MultiPageUi": "androidx/wear/internal/widget/drawer/MultiPageUi",
-      "android/support/wear/R": "androidx/wear/R",
-      "android/support/wear/widget/drawer/PageIndicatorView": "androidx/wear/widget/drawer/PageIndicatorView",
-      "android/support/wear/internal/widget/drawer/SinglePagePresenter": "androidx/wear/internal/widget/drawer/SinglePagePresenter",
-      "android/support/wear/internal/widget/drawer/SinglePageUi": "androidx/wear/internal/widget/drawer/SinglePageUi",
-      "android/support/wear/widget/CircledImageView": "androidx/wear/widget/CircledImageView",
-      "android/support/wear/utils/MetadataConstants": "androidx/wear/utils/MetadataConstants",
-      "android/support/wear/widget/BezierSCurveInterpolator": "androidx/wear/widget/BezierSCurveInterpolator",
-      "android/support/wear/widget/BoxInsetLayout": "androidx/wear/widget/BoxInsetLayout",
-      "android/support/wear/widget/ProgressDrawable": "androidx/wear/widget/ProgressDrawable",
-      "android/support/wear/widget/CircularProgressLayout": "androidx/wear/widget/CircularProgressLayout",
-      "android/support/wear/widget/CircularProgressLayoutController": "androidx/wear/widget/CircularProgressLayoutController",
-      "android/support/wear/widget/CurvingLayoutCallback": "androidx/wear/widget/CurvingLayoutCallback",
-      "android/support/wear/widget/WearableLinearLayoutManager": "androidx/wear/widget/WearableLinearLayoutManager",
-      "android/support/wear/widget/RoundedDrawable": "androidx/wear/widget/RoundedDrawable",
-      "android/support/wear/widget/ScrollManager": "androidx/wear/widget/ScrollManager",
-      "android/support/wear/widget/SimpleAnimatorListener": "androidx/wear/widget/SimpleAnimatorListener",
-      "android/support/wear/widget/SwipeDismissFrameLayout": "androidx/wear/widget/SwipeDismissFrameLayout",
-      "android/support/wear/widget/SwipeDismissLayout": "androidx/wear/widget/SwipeDismissLayout",
-      "android/support/wear/widget/WearableRecyclerView": "androidx/wear/widget/WearableRecyclerView",
-      "android/support/wear/widget/drawer/AbsListViewFlingWatcher": "androidx/wear/widget/drawer/AbsListViewFlingWatcher",
-      "android/support/wear/widget/drawer/FlingWatcherFactory": "androidx/wear/widget/drawer/FlingWatcherFactory",
-      "android/support/wear/widget/drawer/RecyclerViewFlingWatcher": "androidx/wear/widget/drawer/RecyclerViewFlingWatcher",
-      "android/support/wear/widget/drawer/ScrollViewFlingWatcher": "androidx/wear/widget/drawer/ScrollViewFlingWatcher",
-      "android/support/wear/widget/drawer/NestedScrollViewFlingWatcher": "androidx/wear/widget/drawer/NestedScrollViewFlingWatcher",
-      "android/support/wear/widget/drawer/WearableActionDrawerMenu": "androidx/wear/widget/drawer/WearableActionDrawerMenu",
-      "android/support/wear/widget/drawer/WearableActionDrawerView": "androidx/wear/widget/drawer/WearableActionDrawerView",
-      "android/support/wear/widget/drawer/WearableDrawerView": "androidx/wear/widget/drawer/WearableDrawerView",
-      "android/support/wear/widget/drawer/WearableDrawerLayout": "androidx/wear/widget/drawer/WearableDrawerLayout",
-      "android/support/v4/content/LocalBroadcastManager": "androidx/localbroadcastmanager/content/LocalBroadcastManager",
-      "android/support/v4/print/PrintHelper": "androidx/print/PrintHelper",
-      "android/support/media/ExifInterface": "androidx/exifinterface/media/ExifInterface",
-      "android/support/v7/app/MediaRouteActionProvider": "androidx/mediarouter/app/MediaRouteActionProvider",
-      "android/support/v7/media/MediaRouter": "androidx/mediarouter/media/MediaRouter",
-      "android/support/v7/media/MediaRouteSelector": "androidx/mediarouter/media/MediaRouteSelector",
-      "android/support/v7/app/MediaRouteDialogFactory": "androidx/mediarouter/app/MediaRouteDialogFactory",
-      "android/support/v7/app/MediaRouteButton": "androidx/mediarouter/app/MediaRouteButton",
-      "android/support/v7/mediarouter/R": "androidx/mediarouter/R",
-      "android/support/v7/app/MediaRouterThemeHelper": "androidx/mediarouter/app/MediaRouterThemeHelper",
-      "android/support/v7/app/MediaRouteChooserDialogFragment": "androidx/mediarouter/app/MediaRouteChooserDialogFragment",
-      "android/support/v7/app/MediaRouteControllerDialogFragment": "androidx/mediarouter/app/MediaRouteControllerDialogFragment",
-      "android/support/v7/app/MediaRouteChooserDialog": "androidx/mediarouter/app/MediaRouteChooserDialog",
-      "android/support/v7/app/MediaRouteDialogHelper": "androidx/mediarouter/app/MediaRouteDialogHelper",
-      "android/support/v7/app/MediaRouteControllerDialog": "androidx/mediarouter/app/MediaRouteControllerDialog",
-      "android/support/v7/app/OverlayListView": "androidx/mediarouter/app/OverlayListView",
-      "android/support/v7/app/MediaRouteVolumeSlider": "androidx/mediarouter/app/MediaRouteVolumeSlider",
-      "android/support/v7/app/AlertDialog": "androidx/appcompat/app/AlertDialog",
-      "android/support/v7/app/MediaRouteExpandCollapseButton": "androidx/mediarouter/app/MediaRouteExpandCollapseButton",
-      "android/support/v7/app/MediaRouteDiscoveryFragment": "androidx/mediarouter/app/MediaRouteDiscoveryFragment",
-      "android/support/v7/widget/AppCompatSeekBar": "androidx/appcompat/widget/AppCompatSeekBar",
-      "android/support/v7/media/MediaControlIntent": "androidx/mediarouter/media/MediaControlIntent",
-      "android/support/v7/media/MediaItemMetadata": "androidx/mediarouter/media/MediaItemMetadata",
-      "android/support/v7/media/MediaItemStatus": "androidx/mediarouter/media/MediaItemStatus",
-      "android/support/v7/media/MediaRouteDescriptor": "androidx/mediarouter/media/MediaRouteDescriptor",
-      "android/support/v7/media/MediaRouteDiscoveryRequest": "androidx/mediarouter/media/MediaRouteDiscoveryRequest",
-      "android/support/v7/media/MediaRouteProvider": "androidx/mediarouter/media/MediaRouteProvider",
-      "android/support/v7/media/MediaRouteProviderDescriptor": "androidx/mediarouter/media/MediaRouteProviderDescriptor",
-      "android/support/v7/media/MediaRouteProviderProtocol": "androidx/mediarouter/media/MediaRouteProviderProtocol",
-      "android/support/v7/media/MediaRouteProviderService": "androidx/mediarouter/media/MediaRouteProviderService",
-      "android/support/v7/media/SystemMediaRouteProvider": "androidx/mediarouter/media/SystemMediaRouteProvider",
-      "android/support/v7/media/RemoteControlClientCompat": "androidx/mediarouter/media/RemoteControlClientCompat",
-      "android/support/v7/media/RegisteredMediaRouteProviderWatcher": "androidx/mediarouter/media/RegisteredMediaRouteProviderWatcher",
-      "android/support/v7/media/MediaRouterApi24": "androidx/mediarouter/media/MediaRouterApi24",
-      "android/support/v7/media/MediaRouterJellybean": "androidx/mediarouter/media/MediaRouterJellybean",
-      "android/support/v7/media/MediaRouterJellybeanMr1": "androidx/mediarouter/media/MediaRouterJellybeanMr1",
-      "android/support/v7/media/MediaRouterJellybeanMr2": "androidx/mediarouter/media/MediaRouterJellybeanMr2",
-      "android/support/v7/media/MediaSessionStatus": "androidx/mediarouter/media/MediaSessionStatus",
-      "android/support/v7/media/RegisteredMediaRouteProvider": "androidx/mediarouter/media/RegisteredMediaRouteProvider",
-      "android/support/v7/media/RemotePlaybackClient": "androidx/mediarouter/media/RemotePlaybackClient",
-      "android/support/graphics/drawable/Animatable2Compat": "androidx/vectordrawable/graphics/drawable/Animatable2Compat",
-      "android/support/graphics/drawable/AnimatedVectorDrawableCompat": "androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat",
-      "android/support/graphics/drawable/VectorDrawableCompat": "androidx/vectordrawable/graphics/drawable/VectorDrawableCompat",
-      "android/support/graphics/drawable/VectorDrawableCommon": "androidx/vectordrawable/graphics/drawable/VectorDrawableCommon",
-      "android/support/graphics/drawable/AndroidResources": "androidx/vectordrawable/graphics/drawable/AndroidResources",
-      "android/support/graphics/drawable/AnimatorInflaterCompat": "androidx/vectordrawable/graphics/drawable/AnimatorInflaterCompat",
-      "android/support/graphics/drawable/AnimationUtilsCompat": "androidx/vectordrawable/graphics/drawable/AnimationUtilsCompat",
-      "android/support/graphics/drawable/PathInterpolatorCompat": "androidx/vectordrawable/graphics/drawable/PathInterpolatorCompat",
-      "android/support/graphics/drawable/ArgbEvaluator": "androidx/vectordrawable/graphics/drawable/ArgbEvaluator",
-      "android/support/v17/internal/widget/OutlineOnlyWithChildrenFrameLayout": "androidx/leanback/preference/internal/OutlineOnlyWithChildrenFrameLayout",
-      "android/support/v17/preference/BaseLeanbackPreferenceFragment": "androidx/leanback/preference/BaseLeanbackPreferenceFragment",
-      "android/support/v14/preference/PreferenceFragment": "androidx/preference/PreferenceFragment",
-      "android/support/v17/preference/R": "androidx/leanback/preference/R",
-      "android/support/v7/preference/PreferenceRecyclerViewAccessibilityDelegate": "androidx/preference/PreferenceRecyclerViewAccessibilityDelegate",
-      "android/support/v7/widget/RecyclerViewAccessibilityDelegate": "androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate",
-      "android/support/v17/preference/LeanbackListPreferenceDialogFragment": "androidx/leanback/preference/LeanbackListPreferenceDialogFragment",
-      "android/support/v7/preference/DialogPreference": "androidx/preference/DialogPreference",
-      "android/support/v14/preference/MultiSelectListPreference": "androidx/preference/MultiSelectListPreference",
-      "android/support/v7/preference/ListPreference": "androidx/preference/ListPreference",
-      "android/support/v17/preference/LeanbackPreferenceDialogFragment": "androidx/leanback/preference/LeanbackPreferenceDialogFragment",
-      "android/support/v17/preference/LeanbackPreferenceFragmentTransitionHelperApi21": "androidx/leanback/preference/LeanbackPreferenceFragmentTransitionHelperApi21",
-      "android/support/v7/preference/Preference": "androidx/preference/Preference",
-      "android/support/v17/preference/LeanbackPreferenceFragment": "androidx/leanback/preference/LeanbackPreferenceFragment",
-      "android/support/v7/preference/PreferenceScreen": "androidx/preference/PreferenceScreen",
-      "android/support/v17/preference/LeanbackSettingsFragment": "androidx/leanback/preference/LeanbackSettingsFragment",
-      "android/support/v17/preference/LeanbackSettingsRootView": "androidx/leanback/preference/LeanbackSettingsRootView",
+      "android/support/app/recommendation/ContentRecommendation": "androidx/recommendation/app/ContentRecommendation",
+      "android/support/app/recommendation/RecommendationExtender": "androidx/recommendation/app/RecommendationExtender",
+      "android/support/annotation/FloatRange": "androidx/annotation/FloatRange",
+      "android/support/v4/os/LocaleListCompat": "androidx/core/os/LocaleListCompat",
+      "android/support/design/animation/ArgbEvaluatorCompat": "android/support/design/animation/ArgbEvaluatorCompat",
+      "android/support/design/animation/ChildrenAlphaProperty": "android/support/design/animation/ChildrenAlphaProperty",
+      "android/support/design/animation/R": "android/support/design/animation/R",
+      "android/support/design/animation/DrawableAlphaProperty": "android/support/design/animation/DrawableAlphaProperty",
+      "android/support/design/animation/Positioning": "android/support/design/animation/Positioning",
+      "android/support/design/circularreveal/CircularRevealCompat": "android/support/design/circularreveal/CircularRevealCompat",
+      "android/support/design/circularreveal/CircularRevealWidget": "android/support/design/circularreveal/CircularRevealWidget",
+      "android/support/design/circularreveal/CircularRevealFrameLayout": "android/support/design/circularreveal/CircularRevealFrameLayout",
+      "android/support/design/circularreveal/CircularRevealHelper": "android/support/design/circularreveal/CircularRevealHelper",
+      "android/support/design/circularreveal/CircularRevealGridLayout": "android/support/design/circularreveal/CircularRevealGridLayout",
+      "android/support/design/math/MathUtils": "android/support/design/math/MathUtils",
+      "android/support/design/circularreveal/CircularRevealLinearLayout": "android/support/design/circularreveal/CircularRevealLinearLayout",
+      "android/support/design/circularreveal/CircularRevealRelativeLayout": "android/support/design/circularreveal/CircularRevealRelativeLayout",
       "android/support/transition/AnimatorUtils": "androidx/transition/AnimatorUtils",
       "android/support/transition/AnimatorUtilsImpl": "androidx/transition/AnimatorUtilsImpl",
       "android/support/transition/AnimatorUtilsApi19": "androidx/transition/AnimatorUtilsApi19",
@@ -3263,12 +2900,8 @@
       "android/support/transition/ArcMotion": "androidx/transition/ArcMotion",
       "android/support/transition/PathMotion": "androidx/transition/PathMotion",
       "android/support/transition/Styleable": "androidx/transition/Styleable",
-      "android/support/transition/AutoTransition": "androidx/transition/AutoTransition",
-      "android/support/transition/TransitionSet": "androidx/transition/TransitionSet",
       "android/support/transition/Fade": "androidx/transition/Fade",
-      "android/support/transition/Transition": "androidx/transition/Transition",
       "android/support/transition/ChangeBounds": "androidx/transition/ChangeBounds",
-      "android/support/transition/TransitionValues": "androidx/transition/TransitionValues",
       "android/support/transition/ViewUtils": "androidx/transition/ViewUtils",
       "android/support/transition/ViewOverlayImpl": "androidx/transition/ViewOverlayImpl",
       "android/support/transition/TransitionListenerAdapter": "androidx/transition/TransitionListenerAdapter",
@@ -3294,7 +2927,7 @@
       "android/support/transition/TransitionPropagation": "androidx/transition/TransitionPropagation",
       "android/support/transition/TranslationAnimationCreator": "androidx/transition/TranslationAnimationCreator",
       "android/support/transition/FragmentTransitionSupport": "androidx/transition/FragmentTransitionSupport",
-      "android/support/transition/TransitionManager": "androidx/transition/TransitionManager",
+      "android/support/v4/app/FragmentTransitionImpl": "androidx/fragment/app/FragmentTransitionImpl",
       "android/support/transition/GhostViewApi14": "androidx/transition/GhostViewApi14",
       "android/support/transition/GhostViewApi21": "androidx/transition/GhostViewApi21",
       "android/support/transition/ImageViewUtilsImpl": "androidx/transition/ImageViewUtilsImpl",
@@ -3330,75 +2963,138 @@
       "android/support/transition/ViewUtilsApi14": "androidx/transition/ViewUtilsApi14",
       "android/support/transition/WindowIdApi14": "androidx/transition/WindowIdApi14",
       "android/support/transition/WindowIdApi18": "androidx/transition/WindowIdApi18",
-      "android/support/v14/preference/EditTextPreferenceDialogFragment": "androidx/preference/EditTextPreferenceDialogFragment",
-      "android/support/v14/preference/PreferenceDialogFragment": "androidx/preference/PreferenceDialogFragment",
-      "android/support/v7/preference/EditTextPreference": "androidx/preference/EditTextPreference",
-      "android/support/v14/preference/ListPreferenceDialogFragment": "androidx/preference/ListPreferenceDialogFragment",
-      "android/support/v7/preference/internal/AbstractMultiSelectListPreference": "androidx/preference/internal/AbstractMultiSelectListPreference",
-      "android/support/v7/preference/R": "androidx/preference/R",
-      "android/support/v14/preference/MultiSelectListPreferenceDialogFragment": "androidx/preference/MultiSelectListPreferenceDialogFragment",
-      "android/support/v7/preference/PreferenceGroup": "androidx/preference/PreferenceGroup",
-      "android/support/v7/preference/PreferenceViewHolder": "androidx/preference/PreferenceViewHolder",
-      "android/support/v7/preference/PreferenceManager": "androidx/preference/PreferenceManager",
-      "android/support/v7/preference/PreferenceGroupAdapter": "androidx/preference/PreferenceGroupAdapter",
-      "android/support/v14/preference/SwitchPreference": "androidx/preference/SwitchPreference",
-      "android/support/v7/preference/TwoStatePreference": "androidx/preference/TwoStatePreference",
-      "android/support/v7/internal/widget/PreferenceImageView": "androidx/preference/internal/PreferenceImageView",
-      "android/support/v7/preference/AndroidResources": "androidx/preference/AndroidResources",
-      "android/support/v7/preference/CheckBoxPreference": "androidx/preference/CheckBoxPreference",
-      "android/support/v7/preference/CollapsiblePreferenceGroupController": "androidx/preference/CollapsiblePreferenceGroupController",
-      "android/support/v7/preference/DropDownPreference": "androidx/preference/DropDownPreference",
-      "android/support/v7/preference/EditTextPreferenceDialogFragmentCompat": "androidx/preference/EditTextPreferenceDialogFragmentCompat",
-      "android/support/v7/preference/PreferenceDialogFragmentCompat": "androidx/preference/PreferenceDialogFragmentCompat",
-      "android/support/v7/preference/ListPreferenceDialogFragmentCompat": "androidx/preference/ListPreferenceDialogFragmentCompat",
-      "android/support/v7/preference/MultiSelectListPreferenceDialogFragmentCompat": "androidx/preference/MultiSelectListPreferenceDialogFragmentCompat",
-      "android/support/v7/preference/PreferenceDataStore": "androidx/preference/PreferenceDataStore",
-      "android/support/v7/preference/PreferenceCategory": "androidx/preference/PreferenceCategory",
-      "android/support/v7/preference/PreferenceFragmentCompat": "androidx/preference/PreferenceFragmentCompat",
-      "android/support/v7/preference/PreferenceInflater": "androidx/preference/PreferenceInflater",
-      "android/support/v7/preference/SeekBarPreference": "androidx/preference/SeekBarPreference",
-      "android/support/v7/preference/SwitchPreferenceCompat": "androidx/preference/SwitchPreferenceCompat",
-      "android/support/v7/preference/UnPressableLinearLayout": "androidx/preference/UnPressableLinearLayout",
-      "android/support/v7/view/menu/SubMenuBuilder": "androidx/appcompat/view/menu/SubMenuBuilder",
-      "android/support/v7/widget/LinearLayoutCompat": "androidx/appcompat/widget/LinearLayoutCompat",
-      "android/support/v4/view/PagerTabStrip": "androidx/viewpager/widget/PagerTabStrip",
-      "android/support/v4/view/PagerTitleStrip": "androidx/viewpager/widget/PagerTitleStrip",
-      "android/support/v7/recyclerview/extensions/AsyncListDiffer": "androidx/recyclerview/widget/AsyncListDiffer",
-      "android/support/v7/recyclerview/extensions/ListAdapter": "androidx/recyclerview/widget/ListAdapter",
-      "android/support/v7/util/AsyncListUtil": "androidx/recyclerview/widget/AsyncListUtil",
-      "android/support/v7/util/ThreadUtil": "androidx/recyclerview/widget/ThreadUtil",
-      "android/support/v7/util/TileList": "androidx/recyclerview/widget/TileList",
-      "android/support/v7/util/MessageThreadUtil": "androidx/recyclerview/widget/MessageThreadUtil",
-      "android/support/v7/util/BatchingListUpdateCallback": "androidx/recyclerview/widget/BatchingListUpdateCallback",
-      "android/support/v7/util/SortedList": "androidx/recyclerview/widget/SortedList",
-      "android/support/v7/widget/AdapterHelper": "androidx/recyclerview/widget/AdapterHelper",
-      "android/support/v7/widget/OpReorderer": "androidx/recyclerview/widget/OpReorderer",
-      "android/support/v7/widget/ChildHelper": "androidx/recyclerview/widget/ChildHelper",
-      "android/support/v7/widget/DefaultItemAnimator": "androidx/recyclerview/widget/DefaultItemAnimator",
-      "android/support/v7/widget/DividerItemDecoration": "androidx/recyclerview/widget/DividerItemDecoration",
-      "android/support/v7/widget/FastScroller": "androidx/recyclerview/widget/FastScroller",
-      "android/support/v7/widget/GapWorker": "androidx/recyclerview/widget/GapWorker",
-      "android/support/v7/widget/GridLayoutManager": "androidx/recyclerview/widget/GridLayoutManager",
-      "android/support/v7/widget/LayoutState": "androidx/recyclerview/widget/LayoutState",
-      "android/support/v7/widget/helper/ItemTouchHelper": "androidx/recyclerview/widget/ItemTouchHelper",
-      "android/support/v7/widget/ScrollbarHelper": "androidx/recyclerview/widget/ScrollbarHelper",
-      "android/support/v7/widget/ViewBoundsCheck": "androidx/recyclerview/widget/ViewBoundsCheck",
-      "android/support/v7/widget/LinearSnapHelper": "androidx/recyclerview/widget/LinearSnapHelper",
-      "android/support/v7/widget/SnapHelper": "androidx/recyclerview/widget/SnapHelper",
-      "android/support/v7/widget/PagerSnapHelper": "androidx/recyclerview/widget/PagerSnapHelper",
-      "android/support/v7/widget/PositionMap": "androidx/recyclerview/widget/PositionMap",
-      "android/support/v7/widget/ViewInfoStore": "androidx/recyclerview/widget/ViewInfoStore",
-      "android/support/v7/recyclerview/R": "androidx/recyclerview/R",
-      "android/support/v7/widget/StaggeredGridLayoutManager": "androidx/recyclerview/widget/StaggeredGridLayoutManager",
-      "android/support/v7/widget/helper/ItemTouchUIUtilImpl": "androidx/recyclerview/widget/ItemTouchUIUtilImpl",
-      "android/support/v7/widget/helper/ItemTouchUIUtil": "androidx/recyclerview/widget/ItemTouchUIUtil",
-      "android/support/v7/widget/util/SortedListAdapterCallback": "androidx/recyclerview/widget/SortedListAdapterCallback",
-      "android/support/v4/util/MapCollections": "androidx/collection/MapCollections",
-      "android/support/v4/util/ContainerHelpers": "androidx/collection/ContainerHelpers",
-      "android/support/content/ContentPager": "androidx/contentpager/content/ContentPager",
-      "android/support/content/Query": "androidx/contentpager/content/Query",
-      "android/support/content/InMemoryCursor": "androidx/contentpager/content/InMemoryCursor",
-      "android/support/content/LoaderQueryRunner": "androidx/contentpager/content/LoaderQueryRunner",
+      "android/support/wear/ambient/AmbientDelegate": "androidx/wear/ambient/AmbientDelegate",
+      "android/support/wear/ambient/WearableControllerProvider": "androidx/wear/ambient/WearableControllerProvider",
+      "android/support/wear/ambient/AmbientMode": "androidx/wear/ambient/AmbientMode",
+      "android/support/wear/ambient/AmbientModeSupport": "androidx/wear/ambient/AmbientModeSupport",
+      "android/support/wear/ambient/SharedLibraryVersion": "androidx/wear/ambient/SharedLibraryVersion",
+      "android/support/wear/internal/widget/ResourcesUtil": "androidx/wear/internal/widget/ResourcesUtil",
+      "android/support/annotation/FractionRes": "androidx/annotation/FractionRes",
+      "android/support/wear/internal/widget/drawer/MultiPagePresenter": "androidx/wear/internal/widget/drawer/MultiPagePresenter",
+      "android/support/wear/widget/drawer/WearableNavigationDrawerView": "androidx/wear/widget/drawer/WearableNavigationDrawerView",
+      "android/support/wear/internal/widget/drawer/WearableNavigationDrawerPresenter": "androidx/wear/internal/widget/drawer/WearableNavigationDrawerPresenter",
+      "android/support/wear/widget/drawer/WearableDrawerController": "androidx/wear/widget/drawer/WearableDrawerController",
+      "android/support/wear/internal/widget/drawer/MultiPageUi": "androidx/wear/internal/widget/drawer/MultiPageUi",
+      "android/support/wear/R": "androidx/wear/R",
+      "android/support/wear/widget/drawer/PageIndicatorView": "androidx/wear/widget/drawer/PageIndicatorView",
+      "android/support/wear/internal/widget/drawer/SinglePagePresenter": "androidx/wear/internal/widget/drawer/SinglePagePresenter",
+      "android/support/wear/internal/widget/drawer/SinglePageUi": "androidx/wear/internal/widget/drawer/SinglePageUi",
+      "android/support/wear/widget/CircledImageView": "androidx/wear/widget/CircledImageView",
+      "android/support/wear/utils/MetadataConstants": "androidx/wear/utils/MetadataConstants",
+      "android/support/wear/widget/BezierSCurveInterpolator": "androidx/wear/widget/BezierSCurveInterpolator",
+      "android/support/wear/widget/BoxInsetLayout": "androidx/wear/widget/BoxInsetLayout",
+      "android/support/wear/widget/ProgressDrawable": "androidx/wear/widget/ProgressDrawable",
+      "android/support/wear/widget/CircularProgressLayout": "androidx/wear/widget/CircularProgressLayout",
+      "android/support/v4/widget/CircularProgressDrawable": "androidx/swiperefreshlayout/widget/CircularProgressDrawable",
+      "android/support/wear/widget/CircularProgressLayoutController": "androidx/wear/widget/CircularProgressLayoutController",
+      "android/support/wear/widget/CurvingLayoutCallback": "androidx/wear/widget/CurvingLayoutCallback",
+      "android/support/wear/widget/WearableLinearLayoutManager": "androidx/wear/widget/WearableLinearLayoutManager",
+      "android/support/wear/widget/RoundedDrawable": "androidx/wear/widget/RoundedDrawable",
+      "android/support/wear/widget/ScrollManager": "androidx/wear/widget/ScrollManager",
+      "android/support/wear/widget/SimpleAnimatorListener": "androidx/wear/widget/SimpleAnimatorListener",
+      "android/support/wear/widget/SwipeDismissFrameLayout": "androidx/wear/widget/SwipeDismissFrameLayout",
+      "android/support/wear/widget/SwipeDismissLayout": "androidx/wear/widget/SwipeDismissLayout",
+      "android/support/wear/widget/WearableRecyclerView": "androidx/wear/widget/WearableRecyclerView",
+      "android/support/wear/widget/drawer/AbsListViewFlingWatcher": "androidx/wear/widget/drawer/AbsListViewFlingWatcher",
+      "android/support/wear/widget/drawer/FlingWatcherFactory": "androidx/wear/widget/drawer/FlingWatcherFactory",
+      "android/support/wear/widget/drawer/RecyclerViewFlingWatcher": "androidx/wear/widget/drawer/RecyclerViewFlingWatcher",
+      "android/support/wear/widget/drawer/ScrollViewFlingWatcher": "androidx/wear/widget/drawer/ScrollViewFlingWatcher",
+      "android/support/v4/widget/NestedScrollView": "androidx/core/widget/NestedScrollView",
+      "android/support/wear/widget/drawer/NestedScrollViewFlingWatcher": "androidx/wear/widget/drawer/NestedScrollViewFlingWatcher",
+      "android/support/wear/widget/drawer/WearableActionDrawerMenu": "androidx/wear/widget/drawer/WearableActionDrawerMenu",
+      "android/support/wear/widget/drawer/WearableActionDrawerView": "androidx/wear/widget/drawer/WearableActionDrawerView",
+      "android/support/wear/widget/drawer/WearableDrawerView": "androidx/wear/widget/drawer/WearableDrawerView",
+      "android/support/wear/widget/drawer/WearableDrawerLayout": "androidx/wear/widget/drawer/WearableDrawerLayout",
+      "android/support/v4/view/NestedScrollingParent": "androidx/core/view/NestedScrollingParent",
+      "android/support/v4/view/NestedScrollingParentHelper": "androidx/core/view/NestedScrollingParentHelper",
+      "android/arch/lifecycle/ComputableLiveData": "androidx/lifecycle/ComputableLiveData",
+      "android/arch/core/executor/ArchTaskExecutor": "androidx/arch/core/executor/ArchTaskExecutor",
+      "android/arch/lifecycle/MediatorLiveData": "androidx/lifecycle/MediatorLiveData",
+      "android/arch/lifecycle/MutableLiveData": "androidx/lifecycle/MutableLiveData",
+      "android/arch/core/internal/SafeIterableMap": "androidx/arch/core/internal/SafeIterableMap",
+      "android/arch/lifecycle/Transformations": "androidx/lifecycle/Transformations",
+      "android/arch/core/util/Function": "androidx/arch/core/util/Function",
+      "android/arch/persistence/room/guava/GuavaRoom": "androidx/room/guava/GuavaRoom",
+      "android/arch/persistence/room/RoomSQLiteQuery": "androidx/room/RoomSQLiteQuery",
+      "android/support/v4/app/LoaderManager": "androidx/loader/app/LoaderManager",
+      "android/support/v4/content/Loader": "androidx/loader/content/Loader",
+      "android/arch/lifecycle/ViewModelStoreOwner": "androidx/lifecycle/ViewModelStoreOwner",
+      "android/support/v4/app/LoaderManagerImpl": "androidx/loader/app/LoaderManagerImpl",
+      "android/arch/lifecycle/ViewModelStore": "androidx/lifecycle/ViewModelStore",
+      "android/support/v4/util/DebugUtils": "androidx/core/util/DebugUtils",
+      "android/arch/lifecycle/ViewModelProvider": "androidx/lifecycle/ViewModelProvider",
+      "android/arch/lifecycle/ViewModel": "androidx/lifecycle/ViewModel",
+      "android/support/v4/content/AsyncTaskLoader": "androidx/loader/content/AsyncTaskLoader",
+      "android/support/v4/content/ModernAsyncTask": "androidx/loader/content/ModernAsyncTask",
+      "android/support/v4/os/OperationCanceledException": "androidx/core/os/OperationCanceledException",
+      "android/support/v4/content/CursorLoader": "androidx/loader/content/CursorLoader",
+      "android/support/v4/os/CancellationSignal": "androidx/core/os/CancellationSignal",
+      "android/support/v4/content/ContentResolverCompat": "androidx/core/content/ContentResolverCompat",
+      "android/support/v4/widget/DrawerLayout": "androidx/drawerlayout/widget/DrawerLayout",
+      "android/databinding/adapters/AbsListViewBindingAdapter": "androidx/databinding/adapters/AbsListViewBindingAdapter",
+      "android/databinding/adapters/AbsSeekBarBindingAdapter": "androidx/databinding/adapters/AbsSeekBarBindingAdapter",
+      "android/databinding/adapters/AbsSpinnerBindingAdapter": "androidx/databinding/adapters/AbsSpinnerBindingAdapter",
+      "android/databinding/adapters/ObservableListAdapter": "androidx/databinding/adapters/ObservableListAdapter",
+      "android/databinding/adapters/ActionMenuViewBindingAdapter": "androidx/databinding/adapters/ActionMenuViewBindingAdapter",
+      "android/databinding/adapters/AdapterViewBindingAdapter": "androidx/databinding/adapters/AdapterViewBindingAdapter",
+      "android/databinding/adapters/AutoCompleteTextViewBindingAdapter": "androidx/databinding/adapters/AutoCompleteTextViewBindingAdapter",
+      "android/databinding/adapters/CalendarViewBindingAdapter": "androidx/databinding/adapters/CalendarViewBindingAdapter",
+      "android/databinding/adapters/CardViewBindingAdapter": "androidx/databinding/adapters/CardViewBindingAdapter",
+      "android/databinding/adapters/CheckedTextViewBindingAdapter": "androidx/databinding/adapters/CheckedTextViewBindingAdapter",
+      "android/databinding/adapters/ChronometerBindingAdapter": "androidx/databinding/adapters/ChronometerBindingAdapter",
+      "android/databinding/adapters/CompoundButtonBindingAdapter": "androidx/databinding/adapters/CompoundButtonBindingAdapter",
+      "android/databinding/adapters/Converters": "androidx/databinding/adapters/Converters",
+      "android/databinding/adapters/DatePickerBindingAdapter": "androidx/databinding/adapters/DatePickerBindingAdapter",
+      "android/databinding/adapters/ListenerUtil": "androidx/databinding/adapters/ListenerUtil",
+      "android/databinding/adapters/ExpandableListViewBindingAdapter": "androidx/databinding/adapters/ExpandableListViewBindingAdapter",
+      "android/databinding/adapters/FrameLayoutBindingAdapter": "androidx/databinding/adapters/FrameLayoutBindingAdapter",
+      "android/databinding/adapters/ImageViewBindingAdapter": "androidx/databinding/adapters/ImageViewBindingAdapter",
+      "android/databinding/adapters/LinearLayoutBindingAdapter": "androidx/databinding/adapters/LinearLayoutBindingAdapter",
+      "android/databinding/adapters/NumberPickerBindingAdapter": "androidx/databinding/adapters/NumberPickerBindingAdapter",
+      "android/databinding/adapters/ProgressBarBindingAdapter": "androidx/databinding/adapters/ProgressBarBindingAdapter",
+      "android/databinding/adapters/RadioGroupBindingAdapter": "androidx/databinding/adapters/RadioGroupBindingAdapter",
+      "android/databinding/adapters/RatingBarBindingAdapter": "androidx/databinding/adapters/RatingBarBindingAdapter",
+      "android/databinding/adapters/SearchViewBindingAdapter": "androidx/databinding/adapters/SearchViewBindingAdapter",
+      "android/databinding/adapters/SeekBarBindingAdapter": "androidx/databinding/adapters/SeekBarBindingAdapter",
+      "android/databinding/adapters/SpinnerBindingAdapter": "androidx/databinding/adapters/SpinnerBindingAdapter",
+      "android/databinding/adapters/SwitchBindingAdapter": "androidx/databinding/adapters/SwitchBindingAdapter",
+      "android/databinding/adapters/SwitchCompatBindingAdapter": "androidx/databinding/adapters/SwitchCompatBindingAdapter",
+      "android/support/v7/widget/SwitchCompat": "androidx/appcompat/widget/SwitchCompat",
+      "android/databinding/adapters/TabHostBindingAdapter": "androidx/databinding/adapters/TabHostBindingAdapter",
+      "android/databinding/adapters/TabWidgetBindingAdapter": "androidx/databinding/adapters/TabWidgetBindingAdapter",
+      "android/databinding/adapters/TableLayoutBindingAdapter": "androidx/databinding/adapters/TableLayoutBindingAdapter",
+      "android/databinding/adapters/TextViewBindingAdapter": "androidx/databinding/adapters/TextViewBindingAdapter",
+      "android/databinding/adapters/TimePickerBindingAdapter": "androidx/databinding/adapters/TimePickerBindingAdapter",
+      "android/databinding/adapters/ToolbarBindingAdapter": "androidx/databinding/adapters/ToolbarBindingAdapter",
+      "android/databinding/adapters/VideoViewBindingAdapter": "androidx/databinding/adapters/VideoViewBindingAdapter",
+      "android/databinding/adapters/ViewBindingAdapter": "androidx/databinding/adapters/ViewBindingAdapter",
+      "android/databinding/adapters/ViewGroupBindingAdapter": "androidx/databinding/adapters/ViewGroupBindingAdapter",
+      "android/databinding/adapters/ViewStubBindingAdapter": "androidx/databinding/adapters/ViewStubBindingAdapter",
+      "android/databinding/adapters/ZoomControlsBindingAdapter": "androidx/databinding/adapters/ZoomControlsBindingAdapter",
+      "android/support/media/ExifInterface": "androidx/exifinterface/media/ExifInterface",
+      "android/arch/lifecycle/ErrorMessages": "androidx/lifecycle/ErrorMessages",
+      "android/arch/lifecycle/model/EventMethod": "androidx/lifecycle/model/EventMethod",
+      "android/arch/lifecycle/Elements_extKt": "androidx/lifecycle/Elements_extKt",
+      "android/arch/lifecycle/WriterKt": "androidx/lifecycle/WriterKt",
+      "android/arch/lifecycle/ObserversCollector": "androidx/lifecycle/ObserversCollector",
+      "android/arch/lifecycle/Validator": "androidx/lifecycle/Validator",
+      "android/arch/lifecycle/model/LifecycleObserverInfo": "androidx/lifecycle/model/LifecycleObserverInfo",
+      "android/arch/lifecycle/model/AdapterClassKt": "androidx/lifecycle/model/AdapterClassKt",
+      "android/arch/lifecycle/model/EventMethodCall": "androidx/lifecycle/model/EventMethodCall",
+      "android/arch/lifecycle/model/AdapterClass": "androidx/lifecycle/model/AdapterClass",
+      "android/arch/lifecycle/model/InputModel": "androidx/lifecycle/model/InputModel",
+      "android/arch/lifecycle/Lifecycling": "androidx/lifecycle/Lifecycling",
+      "android/arch/lifecycle/LifecycleProcessor": "androidx/lifecycle/LifecycleProcessor",
+      "android/arch/lifecycle/Input_collectorKt": "androidx/lifecycle/Input_collectorKt",
+      "android/arch/lifecycle/TransformationKt": "androidx/lifecycle/TransformationKt",
+      "android/arch/lifecycle/GeneratedAdapter": "androidx/lifecycle/GeneratedAdapter",
+      "android/arch/lifecycle/MethodCallsLogger": "androidx/lifecycle/MethodCallsLogger",
+      "android/support/design/bottomnavigation/LabelVisibilityMode": "android/support/design/bottomnavigation/LabelVisibilityMode",
+      "android/arch/lifecycle/LifecycleRegistry": "androidx/lifecycle/LifecycleRegistry",
+      "android/arch/lifecycle/GenericLifecycleObserver": "androidx/lifecycle/GenericLifecycleObserver",
+      "android/arch/core/internal/FastSafeIterableMap": "androidx/arch/core/internal/FastSafeIterableMap",
+      "android/arch/lifecycle/LifecycleRegistryOwner": "androidx/lifecycle/LifecycleRegistryOwner",
+      "android/arch/lifecycle/ReportFragment": "androidx/lifecycle/ReportFragment",
       "android/arch/persistence/room/parser/SQLiteParser": "androidx/room/parser/SQLiteParser",
       "android/arch/persistence/room/parser/SQLiteListener": "androidx/room/parser/SQLiteListener",
       "android/arch/persistence/room/parser/SQLiteVisitor": "androidx/room/parser/SQLiteVisitor",
@@ -3532,6 +3228,7 @@
       "android/arch/persistence/room/vo/InsertionMethod": "androidx/room/vo/InsertionMethod",
       "android/arch/persistence/room/vo/DaoMethod": "androidx/room/vo/DaoMethod",
       "android/arch/persistence/room/ext/SupportDbTypeNames": "androidx/room/ext/SupportDbTypeNames",
+      "android/arch/persistence/room/RoomMasterTable": "androidx/room/RoomMasterTable",
       "android/arch/persistence/room/RoomProcessor": "androidx/room/RoomProcessor",
       "android/arch/persistence/room/writer/EntityInsertionAdapterWriter": "androidx/room/writer/EntityInsertionAdapterWriter",
       "android/arch/persistence/room/writer/TableInfoValidationWriter": "androidx/room/writer/TableInfoValidationWriter",
@@ -3550,6 +3247,7 @@
       "android/arch/persistence/room/Dao": "androidx/room/Dao",
       "android/arch/persistence/room/processor/CustomConverterProcessor": "androidx/room/processor/CustomConverterProcessor",
       "android/arch/persistence/room/processor/cache/Cache": "androidx/room/processor/cache/Cache",
+      "android/arch/persistence/room/ColumnInfo": "androidx/room/ColumnInfo",
       "android/arch/persistence/room/Embedded": "androidx/room/Embedded",
       "android/arch/persistence/room/Relation": "androidx/room/Relation",
       "android/arch/persistence/room/Ignore": "androidx/room/Ignore",
@@ -3575,12 +3273,237 @@
       "android/arch/persistence/room/TypeConverter": "androidx/room/TypeConverter",
       "android/arch/persistence/room/TypeConverters": "androidx/room/TypeConverters",
       "android/arch/persistence/room/PrimaryKey": "androidx/room/PrimaryKey",
+      "android/support/design/resources/TextAppearance": "android/support/design/resources/TextAppearance",
+      "android/support/design/resources/R": "android/support/design/resources/R",
+      "android/support/annotation/FontRes": "androidx/annotation/FontRes",
+      "android/support/v13/view/DragAndDropPermissionsCompat": "androidx/core/view/DragAndDropPermissionsCompat",
+      "android/support/v13/view/DragStartHelper": "androidx/core/view/DragStartHelper",
+      "android/support/v13/view/inputmethod/EditorInfoCompat": "androidx/core/view/inputmethod/EditorInfoCompat",
+      "android/support/v13/view/inputmethod/InputConnectionCompat": "androidx/core/view/inputmethod/InputConnectionCompat",
+      "android/support/v13/view/inputmethod/InputContentInfoCompat": "androidx/core/view/inputmethod/InputContentInfoCompat",
+      "android/support/v4/accessibilityservice/AccessibilityServiceInfoCompat": "androidx/core/accessibilityservice/AccessibilityServiceInfoCompat",
+      "android/support/v4/app/ActivityOptionsCompat": "androidx/core/app/ActivityOptionsCompat",
+      "android/support/v4/app/AlarmManagerCompat": "androidx/core/app/AlarmManagerCompat",
+      "android/support/v4/app/AppLaunchChecker": "androidx/core/app/AppLaunchChecker",
+      "android/support/v4/app/AppOpsManagerCompat": "androidx/core/app/AppOpsManagerCompat",
+      "android/support/v4/app/FrameMetricsAggregator": "androidx/core/app/FrameMetricsAggregator",
+      "android/support/v4/app/INotificationSideChannel": "androidx/core/app/INotificationSideChannel",
+      "android/support/v4/app/JobIntentService": "androidx/core/app/JobIntentService",
+      "android/support/v4/app/NavUtils": "androidx/core/app/NavUtils",
+      "android/support/v4/app/RemoteInput": "androidx/core/app/RemoteInput",
+      "android/support/v4/app/NotificationCompatBuilder": "androidx/core/app/NotificationCompatBuilder",
+      "android/support/compat/R": "androidx/core/R",
+      "android/support/v4/text/BidiFormatter": "androidx/core/text/BidiFormatter",
+      "android/support/v4/app/NotificationCompatJellybean": "androidx/core/app/NotificationCompatJellybean",
+      "android/support/v4/app/NotificationCompatExtras": "androidx/core/app/NotificationCompatExtras",
+      "android/support/v4/app/NotificationCompatSideChannelService": "androidx/core/app/NotificationCompatSideChannelService",
+      "android/support/v4/app/NotificationManagerCompat": "androidx/core/app/NotificationManagerCompat",
+      "android/support/annotation/GuardedBy": "androidx/annotation/GuardedBy",
+      "android/support/v4/app/ServiceCompat": "androidx/core/app/ServiceCompat",
+      "android/support/v4/app/ShareCompat": "androidx/core/app/ShareCompat",
+      "android/support/v4/app/TaskStackBuilder": "androidx/core/app/TaskStackBuilder",
+      "android/support/v4/content/FileProvider": "androidx/core/content/FileProvider",
+      "android/support/v4/content/IntentCompat": "androidx/core/content/IntentCompat",
+      "android/support/v4/content/MimeTypeFilter": "androidx/core/content/MimeTypeFilter",
+      "android/support/v4/content/PermissionChecker": "androidx/core/content/PermissionChecker",
+      "android/support/v4/content/SharedPreferencesCompat": "androidx/core/content/SharedPreferencesCompat",
+      "android/support/v4/content/pm/ActivityInfoCompat": "androidx/core/content/pm/ActivityInfoCompat",
+      "android/support/v4/content/pm/ShortcutInfoCompat": "androidx/core/content/pm/ShortcutInfoCompat",
+      "android/support/v4/graphics/drawable/IconCompat": "androidx/core/graphics/drawable/IconCompat",
+      "android/support/v4/content/pm/ShortcutManagerCompat": "androidx/core/content/pm/ShortcutManagerCompat",
+      "android/support/v4/content/res/ConfigurationHelper": "androidx/core/content/res/ConfigurationHelper",
+      "android/support/v4/content/res/FontResourcesParserCompat": "androidx/core/content/res/FontResourcesParserCompat",
+      "android/support/v4/provider/FontRequest": "androidx/core/provider/FontRequest",
+      "android/support/annotation/ArrayRes": "androidx/annotation/ArrayRes",
+      "android/support/v4/provider/FontsContractCompat": "androidx/core/provider/FontsContractCompat",
+      "android/support/v4/graphics/TypefaceCompat": "androidx/core/graphics/TypefaceCompat",
+      "android/support/annotation/AnyRes": "androidx/annotation/AnyRes",
+      "android/support/v4/database/DatabaseUtilsCompat": "androidx/core/database/DatabaseUtilsCompat",
+      "android/support/v4/graphics/BitmapCompat": "androidx/core/graphics/BitmapCompat",
+      "android/support/v4/graphics/PaintCompat": "androidx/core/graphics/PaintCompat",
+      "android/support/v4/graphics/TypefaceCompatApi28Impl": "androidx/core/graphics/TypefaceCompatApi28Impl",
+      "android/support/v4/graphics/TypefaceCompatApi26Impl": "androidx/core/graphics/TypefaceCompatApi26Impl",
+      "android/support/v4/graphics/TypefaceCompatApi24Impl": "androidx/core/graphics/TypefaceCompatApi24Impl",
+      "android/support/v4/graphics/TypefaceCompatApi21Impl": "androidx/core/graphics/TypefaceCompatApi21Impl",
+      "android/support/v4/graphics/TypefaceCompatBaseImpl": "androidx/core/graphics/TypefaceCompatBaseImpl",
+      "android/support/v4/graphics/TypefaceCompatUtil": "androidx/core/graphics/TypefaceCompatUtil",
+      "android/support/v4/graphics/drawable/WrappedDrawable": "androidx/core/graphics/drawable/WrappedDrawable",
+      "android/support/v4/graphics/drawable/WrappedDrawableApi21": "androidx/core/graphics/drawable/WrappedDrawableApi21",
+      "android/support/v4/graphics/drawable/WrappedDrawableApi19": "androidx/core/graphics/drawable/WrappedDrawableApi19",
+      "android/support/v4/graphics/drawable/WrappedDrawableApi14": "androidx/core/graphics/drawable/WrappedDrawableApi14",
+      "android/support/v4/graphics/drawable/RoundedBitmapDrawable": "androidx/core/graphics/drawable/RoundedBitmapDrawable",
+      "android/support/v4/graphics/drawable/RoundedBitmapDrawable21": "androidx/core/graphics/drawable/RoundedBitmapDrawable21",
+      "android/support/v4/graphics/drawable/RoundedBitmapDrawableFactory": "androidx/core/graphics/drawable/RoundedBitmapDrawableFactory",
+      "android/support/v4/hardware/fingerprint/FingerprintManagerCompat": "androidx/core/hardware/fingerprint/FingerprintManagerCompat",
+      "android/support/annotation/RequiresPermission": "androidx/annotation/RequiresPermission",
+      "android/support/v4/internal/view/SupportMenu": "androidx/core/internal/view/SupportMenu",
+      "android/support/v4/internal/view/SupportMenuItem": "androidx/core/internal/view/SupportMenuItem",
+      "android/support/v4/internal/view/SupportSubMenu": "androidx/core/internal/view/SupportSubMenu",
+      "android/support/v4/math/MathUtils": "androidx/core/math/MathUtils",
+      "android/support/v4/net/ConnectivityManagerCompat": "androidx/core/net/ConnectivityManagerCompat",
+      "android/support/v4/net/DatagramSocketWrapper": "androidx/core/net/DatagramSocketWrapper",
+      "android/support/v4/net/TrafficStatsCompat": "androidx/core/net/TrafficStatsCompat",
+      "android/support/v4/os/ConfigurationCompat": "androidx/core/os/ConfigurationCompat",
+      "android/support/v4/os/EnvironmentCompat": "androidx/core/os/EnvironmentCompat",
+      "android/support/v4/os/IResultReceiver": "androidx/core/os/IResultReceiver",
+      "android/support/v4/os/LocaleHelper": "androidx/core/os/LocaleHelper",
+      "android/support/v4/os/LocaleListInterface": "androidx/core/os/LocaleListInterface",
+      "android/support/v4/os/LocaleListHelper": "androidx/core/os/LocaleListHelper",
+      "android/support/annotation/Size": "androidx/annotation/Size",
+      "android/support/v4/os/ParcelableCompat": "androidx/core/os/ParcelableCompat",
+      "android/support/v4/os/ParcelableCompatCreatorCallbacks": "androidx/core/os/ParcelableCompatCreatorCallbacks",
+      "android/support/v4/os/UserManagerCompat": "androidx/core/os/UserManagerCompat",
+      "android/support/v4/provider/SelfDestructiveThread": "androidx/core/provider/SelfDestructiveThread",
+      "android/support/v4/text/TextUtilsCompat": "androidx/core/text/TextUtilsCompat",
+      "android/support/v4/text/ICUCompat": "androidx/core/text/ICUCompat",
+      "android/support/v4/text/util/FindAddress": "androidx/core/text/util/FindAddress",
+      "android/support/v4/text/util/LinkifyCompat": "androidx/core/text/util/LinkifyCompat",
+      "android/support/v4/util/PatternsCompat": "androidx/core/util/PatternsCompat",
+      "android/support/v4/util/AtomicFile": "androidx/core/util/AtomicFile",
+      "android/support/v4/util/LogWriter": "androidx/core/util/LogWriter",
+      "android/support/v4/view/InputDeviceCompat": "androidx/core/view/InputDeviceCompat",
+      "android/support/v4/view/LayoutInflaterCompat": "androidx/core/view/LayoutInflaterCompat",
+      "android/support/v4/view/LayoutInflaterFactory": "androidx/core/view/LayoutInflaterFactory",
+      "android/support/v4/view/MenuCompat": "androidx/core/view/MenuCompat",
+      "android/support/v4/view/MenuItemCompat": "androidx/core/view/MenuItemCompat",
+      "android/support/v4/view/NestedScrollingChild": "androidx/core/view/NestedScrollingChild",
+      "android/support/v4/view/NestedScrollingParent2": "androidx/core/view/NestedScrollingParent2",
+      "android/support/v4/view/ScaleGestureDetectorCompat": "androidx/core/view/ScaleGestureDetectorCompat",
+      "android/support/v4/view/VelocityTrackerCompat": "androidx/core/view/VelocityTrackerCompat",
+      "android/support/v4/view/ViewPropertyAnimatorCompat": "androidx/core/view/ViewPropertyAnimatorCompat",
+      "android/support/v4/view/ViewGroupCompat": "androidx/core/view/ViewGroupCompat",
+      "android/support/v4/view/ViewPropertyAnimatorListener": "androidx/core/view/ViewPropertyAnimatorListener",
+      "android/support/v4/view/ViewPropertyAnimatorUpdateListener": "androidx/core/view/ViewPropertyAnimatorUpdateListener",
+      "android/support/v4/view/ViewPropertyAnimatorListenerAdapter": "androidx/core/view/ViewPropertyAnimatorListenerAdapter",
+      "android/support/v4/view/WindowCompat": "androidx/core/view/WindowCompat",
+      "android/support/v4/view/accessibility/AccessibilityManagerCompat": "androidx/core/view/accessibility/AccessibilityManagerCompat",
+      "android/support/v4/view/accessibility/AccessibilityWindowInfoCompat": "androidx/core/view/accessibility/AccessibilityWindowInfoCompat",
+      "android/support/v4/view/animation/PathInterpolatorApi14": "androidx/core/view/animation/PathInterpolatorApi14",
+      "android/support/v4/view/animation/PathInterpolatorCompat": "androidx/core/view/animation/PathInterpolatorCompat",
+      "android/support/v4/widget/AutoScrollHelper": "androidx/core/widget/AutoScrollHelper",
+      "android/support/v4/widget/AutoSizeableTextView": "androidx/core/widget/AutoSizeableTextView",
+      "android/support/v4/widget/CompoundButtonCompat": "androidx/core/widget/CompoundButtonCompat",
+      "android/support/v4/widget/TintableCompoundButton": "androidx/core/widget/TintableCompoundButton",
+      "android/support/v4/widget/ContentLoadingProgressBar": "androidx/core/widget/ContentLoadingProgressBar",
+      "android/support/v4/widget/ImageViewCompat": "androidx/core/widget/ImageViewCompat",
+      "android/support/v4/widget/ListPopupWindowCompat": "androidx/core/widget/ListPopupWindowCompat",
+      "android/support/v4/widget/ListViewAutoScrollHelper": "androidx/core/widget/ListViewAutoScrollHelper",
+      "android/support/v4/widget/ListViewCompat": "androidx/core/widget/ListViewCompat",
+      "android/support/v4/widget/PopupMenuCompat": "androidx/core/widget/PopupMenuCompat",
+      "android/support/v4/widget/PopupWindowCompat": "androidx/core/widget/PopupWindowCompat",
+      "android/support/v4/widget/ScrollerCompat": "androidx/core/widget/ScrollerCompat",
       "android/support/coordinatorlayout/R": "androidx/coordinatorlayout/R",
       "android/support/v4/widget/DirectedAcyclicGraph": "androidx/coordinatorlayout/widget/DirectedAcyclicGraph",
       "android/support/v4/widget/ViewGroupUtils": "androidx/coordinatorlayout/widget/ViewGroupUtils",
-      "android/support/v4/widget/FocusStrategy": "androidx/customview/widget/FocusStrategy",
-      "android/support/v7/widget/GridLayout": "androidx/gridlayout/widget/GridLayout",
-      "android/support/v7/gridlayout/R": "androidx/gridlayout/R",
+      "android/arch/lifecycle/EmptyActivityLifecycleCallbacks": "androidx/lifecycle/EmptyActivityLifecycleCallbacks",
+      "android/arch/lifecycle/HolderFragment": "androidx/lifecycle/HolderFragment",
+      "android/arch/lifecycle/LifecycleDispatcher": "androidx/lifecycle/LifecycleDispatcher",
+      "android/arch/lifecycle/LifecycleService": "androidx/lifecycle/LifecycleService",
+      "android/arch/lifecycle/ServiceLifecycleDispatcher": "androidx/lifecycle/ServiceLifecycleDispatcher",
+      "android/arch/lifecycle/ProcessLifecycleOwner": "androidx/lifecycle/ProcessLifecycleOwner",
+      "android/arch/lifecycle/ProcessLifecycleOwnerInitializer": "androidx/lifecycle/ProcessLifecycleOwnerInitializer",
+      "android/arch/lifecycle/ViewModelProviders": "androidx/lifecycle/ViewModelProviders",
+      "android/arch/lifecycle/ViewModelStores": "androidx/lifecycle/ViewModelStores",
+      "android/support/animation/AnimationHandler": "androidx/dynamicanimation/animation/AnimationHandler",
+      "android/support/animation/DynamicAnimation": "androidx/dynamicanimation/animation/DynamicAnimation",
+      "android/support/animation/FloatPropertyCompat": "androidx/dynamicanimation/animation/FloatPropertyCompat",
+      "android/support/animation/FloatValueHolder": "androidx/dynamicanimation/animation/FloatValueHolder",
+      "android/support/animation/FlingAnimation": "androidx/dynamicanimation/animation/FlingAnimation",
+      "android/support/animation/Force": "androidx/dynamicanimation/animation/Force",
+      "android/support/animation/SpringAnimation": "androidx/dynamicanimation/animation/SpringAnimation",
+      "android/support/animation/SpringForce": "androidx/dynamicanimation/animation/SpringForce",
+      "android/support/design/transformation/ExpandableBehavior": "android/support/design/transformation/ExpandableBehavior",
+      "android/support/design/transformation/ExpandableTransformationBehavior": "android/support/design/transformation/ExpandableTransformationBehavior",
+      "android/support/design/transformation/FabTransformationBehavior": "android/support/design/transformation/FabTransformationBehavior",
+      "android/support/design/transformation/R": "android/support/design/transformation/R",
+      "android/support/design/transformation/TransformationChildLayout": "android/support/design/transformation/TransformationChildLayout",
+      "android/support/design/transformation/TransformationChildCard": "android/support/design/transformation/TransformationChildCard",
+      "android/support/design/transformation/FabTransformationScrimBehavior": "android/support/design/transformation/FabTransformationScrimBehavior",
+      "android/support/design/transformation/FabTransformationSheetBehavior": "android/support/design/transformation/FabTransformationSheetBehavior",
+      "android/support/design/circularreveal/cardview/CircularRevealCardView": "android/support/design/circularreveal/cardview/CircularRevealCardView",
+      "android/support/content/ContentPager": "androidx/contentpager/content/ContentPager",
+      "android/support/content/Query": "androidx/contentpager/content/Query",
+      "android/support/content/InMemoryCursor": "androidx/contentpager/content/InMemoryCursor",
+      "android/support/content/LoaderQueryRunner": "androidx/contentpager/content/LoaderQueryRunner",
+      "android/support/v4/widget/CursorAdapter": "androidx/cursoradapter/widget/CursorAdapter",
+      "android/support/v4/widget/CursorFilter": "androidx/cursoradapter/widget/CursorFilter",
+      "android/support/v4/widget/ResourceCursorAdapter": "androidx/cursoradapter/widget/ResourceCursorAdapter",
+      "android/support/v4/widget/SimpleCursorAdapter": "androidx/cursoradapter/widget/SimpleCursorAdapter",
+      "android/support/v4/app/ActionBarDrawerToggle": "androidx/legacy/app/ActionBarDrawerToggle",
+      "android/arch/lifecycle/ClassesInfoCache": "androidx/lifecycle/ClassesInfoCache",
+      "android/arch/lifecycle/FullLifecycleObserver": "androidx/lifecycle/FullLifecycleObserver",
+      "android/arch/lifecycle/FullLifecycleObserverAdapter": "androidx/lifecycle/FullLifecycleObserverAdapter",
+      "android/arch/lifecycle/SingleGeneratedAdapterObserver": "androidx/lifecycle/SingleGeneratedAdapterObserver",
+      "android/arch/lifecycle/CompositeGeneratedAdaptersObserver": "androidx/lifecycle/CompositeGeneratedAdaptersObserver",
+      "android/arch/lifecycle/ReflectiveGenericLifecycleObserver": "androidx/lifecycle/ReflectiveGenericLifecycleObserver",
+      "android/support/v4/util/MapCollections": "androidx/collection/MapCollections",
+      "android/support/v4/util/ContainerHelpers": "androidx/collection/ContainerHelpers",
+      "android/support/design/theme/MaterialComponentsViewInflater": "android/support/design/theme/MaterialComponentsViewInflater",
+      "android/support/v7/app/AppCompatViewInflater": "androidx/appcompat/app/AppCompatViewInflater",
+      "android/support/annotation/Keep": "androidx/annotation/Keep",
+      "android/arch/paging/PageResult": "androidx/paging/PageResult",
+      "android/arch/paging/ListDataSource": "androidx/paging/ListDataSource",
+      "android/arch/paging/PositionalDataSource": "androidx/paging/PositionalDataSource",
+      "android/arch/paging/WrapperItemKeyedDataSource": "androidx/paging/WrapperItemKeyedDataSource",
+      "android/arch/paging/DataSource": "androidx/paging/DataSource",
+      "android/arch/paging/PageKeyedDataSource": "androidx/paging/PageKeyedDataSource",
+      "android/arch/paging/ContiguousDataSource": "androidx/paging/ContiguousDataSource",
+      "android/arch/paging/WrapperPageKeyedDataSource": "androidx/paging/WrapperPageKeyedDataSource",
+      "android/arch/paging/ItemKeyedDataSource": "androidx/paging/ItemKeyedDataSource",
+      "android/arch/paging/TiledPagedList": "androidx/paging/TiledPagedList",
+      "android/arch/paging/PagedList": "androidx/paging/PagedList",
+      "android/arch/paging/PagedStorage": "androidx/paging/PagedStorage",
+      "android/support/annotation/AnyThread": "androidx/annotation/AnyThread",
+      "android/arch/paging/TiledDataSource": "androidx/paging/TiledDataSource",
+      "android/arch/paging/WrapperPositionalDataSource": "androidx/paging/WrapperPositionalDataSource",
+      "android/arch/paging/ContiguousPagedList": "androidx/paging/ContiguousPagedList",
+      "android/arch/paging/SnapshotPagedList": "androidx/paging/SnapshotPagedList",
+      "android/support/design/shape/CornerTreatment": "android/support/design/shape/CornerTreatment",
+      "android/support/design/shape/ShapePath": "android/support/design/shape/ShapePath",
+      "android/support/design/shape/CutCornerTreatment": "android/support/design/shape/CutCornerTreatment",
+      "android/support/design/shape/EdgeTreatment": "android/support/design/shape/EdgeTreatment",
+      "android/support/design/shape/InterpolateOnScrollPositionChangeHelper": "android/support/design/shape/InterpolateOnScrollPositionChangeHelper",
+      "android/support/design/shape/MaterialShapeDrawable": "android/support/design/shape/MaterialShapeDrawable",
+      "android/support/design/shape/ShapePathModel": "android/support/design/shape/ShapePathModel",
+      "android/support/design/shape/RoundedCornerTreatment": "android/support/design/shape/RoundedCornerTreatment",
+      "android/support/design/shape/TriangleEdgeTreatment": "android/support/design/shape/TriangleEdgeTreatment",
+      "android/support/design/bottomappbar/BottomAppBar": "android/support/design/bottomappbar/BottomAppBar",
+      "android/support/design/bottomappbar/BottomAppBarTopEdgeTreatment": "android/support/design/bottomappbar/BottomAppBarTopEdgeTreatment",
+      "android/support/v7/widget/ActionMenuView": "androidx/appcompat/widget/ActionMenuView",
+      "android/support/design/bottomappbar/R": "android/support/design/bottomappbar/R",
+      "android/support/annotation/MenuRes": "androidx/annotation/MenuRes",
+      "android/arch/persistence/room/testing/MigrationTestHelper": "androidx/room/testing/MigrationTestHelper",
+      "android/arch/persistence/db/SupportSQLiteDatabase": "androidx/sqlite/db/SupportSQLiteDatabase",
+      "android/arch/persistence/room/util/TableInfo": "androidx/room/util/TableInfo",
+      "android/arch/persistence/room/RoomOpenHelper": "androidx/room/RoomOpenHelper",
+      "android/arch/persistence/db/SupportSQLiteOpenHelper": "androidx/sqlite/db/SupportSQLiteOpenHelper",
+      "android/arch/persistence/room/RoomDatabase": "androidx/room/RoomDatabase",
+      "android/arch/persistence/db/framework/FrameworkSQLiteOpenHelperFactory": "androidx/sqlite/db/framework/FrameworkSQLiteOpenHelperFactory",
+      "android/arch/persistence/room/DatabaseConfiguration": "androidx/room/DatabaseConfiguration",
+      "android/arch/persistence/room/migration/Migration": "androidx/room/migration/Migration",
+      "android/support/v7/graphics/ColorCutQuantizer": "androidx/palette/graphics/ColorCutQuantizer",
+      "android/support/v7/graphics/Target": "androidx/palette/graphics/Target",
+      "android/arch/persistence/room/EmptyResultSetException": "androidx/room/EmptyResultSetException",
+      "android/arch/persistence/room/RxRoom": "androidx/room/RxRoom",
+      "android/arch/persistence/room/InvalidationTracker": "androidx/room/InvalidationTracker",
+      "android/support/v4/view/AsyncLayoutInflater": "androidx/asynclayoutinflater/view/AsyncLayoutInflater",
+      "android/arch/persistence/room/ForeignKey": "androidx/room/ForeignKey",
+      "android/arch/persistence/room/RoomWarnings": "androidx/room/RoomWarnings",
+      "android/arch/persistence/room/Index": "androidx/room/Index",
+      "android/arch/persistence/room/OnConflictStrategy": "androidx/room/OnConflictStrategy",
+      "android/arch/lifecycle/AndroidViewModel": "androidx/lifecycle/AndroidViewModel",
+      "android/support/v4/widget/CircleImageView": "androidx/swiperefreshlayout/widget/CircleImageView",
+      "android/support/v4/widget/SwipeRefreshLayout": "androidx/swiperefreshlayout/widget/SwipeRefreshLayout",
+      "android/support/v4/view/PagerTabStrip": "androidx/viewpager/widget/PagerTabStrip",
+      "android/support/v4/view/PagerTitleStrip": "androidx/viewpager/widget/PagerTitleStrip",
+      "android/support/design/chip/Chip": "android/support/design/chip/Chip",
+      "android/support/design/chip/ChipDrawable": "android/support/design/chip/ChipDrawable",
+      "android/support/design/chip/R": "android/support/design/chip/R",
+      "android/support/v7/widget/AppCompatCheckBox": "androidx/appcompat/widget/AppCompatCheckBox",
+      "android/support/annotation/XmlRes": "androidx/annotation/XmlRes",
+      "android/support/design/canvas/CanvasCompat": "android/support/design/canvas/CanvasCompat",
+      "android/support/design/drawable/DrawableUtils": "android/support/design/drawable/DrawableUtils",
+      "android/support/design/chip/ChipGroup": "android/support/design/chip/ChipGroup",
       "android/support/media/tv/BasePreviewProgram": "androidx/tvprovider/media/tv/BasePreviewProgram",
       "android/support/media/tv/BaseProgram": "androidx/tvprovider/media/tv/BaseProgram",
       "android/support/media/tv/TvContractCompat": "androidx/tvprovider/media/tv/TvContractCompat",
@@ -3593,13 +3516,6 @@
       "android/support/media/tv/PreviewProgram": "androidx/tvprovider/media/tv/PreviewProgram",
       "android/support/media/tv/WatchNextProgram": "androidx/tvprovider/media/tv/WatchNextProgram",
       "android/support/media/tv/Program": "androidx/tvprovider/media/tv/Program",
-      "android/support/v13/app/ActivityCompat": "androidx/legacy/app/ActivityCompat",
-      "android/support/v13/app/FragmentCompat": "androidx/legacy/app/FragmentCompat",
-      "android/support/v13/app/FragmentPagerAdapter": "androidx/legacy/app/FragmentPagerAdapter",
-      "android/support/v13/app/FragmentStatePagerAdapter": "androidx/legacy/app/FragmentStatePagerAdapter",
-      "android/support/v13/app/FragmentTabHost": "androidx/legacy/app/FragmentTabHost",
-      "android/support/v13/view/ViewCompat": "androidx/legacy/view/ViewCompat",
-      "android/support/v4/content/WakefulBroadcastReceiver": "androidx/legacy/content/WakefulBroadcastReceiver",
       "android/support/v7/view/ActionMode": "androidx/appcompat/view/ActionMode",
       "android/support/v7/app/ActionBarDrawerToggle": "androidx/appcompat/app/ActionBarDrawerToggle",
       "android/support/v7/graphics/drawable/DrawerArrowDrawable": "androidx/appcompat/graphics/drawable/DrawerArrowDrawable",
@@ -3631,6 +3547,7 @@
       "android/support/v7/view/StandaloneActionMode": "androidx/appcompat/view/StandaloneActionMode",
       "android/support/v7/widget/TintContextWrapper": "androidx/appcompat/widget/TintContextWrapper",
       "android/support/v7/widget/AppCompatImageView": "androidx/appcompat/widget/AppCompatImageView",
+      "android/support/v7/widget/AppCompatButton": "androidx/appcompat/widget/AppCompatButton",
       "android/support/v7/widget/AppCompatSpinner": "androidx/appcompat/widget/AppCompatSpinner",
       "android/support/v7/widget/AppCompatRadioButton": "androidx/appcompat/widget/AppCompatRadioButton",
       "android/support/v7/widget/AppCompatCheckedTextView": "androidx/appcompat/widget/AppCompatCheckedTextView",
@@ -3686,6 +3603,7 @@
       "android/support/v7/widget/AppCompatHintHelper": "androidx/appcompat/widget/AppCompatHintHelper",
       "android/support/v7/widget/TintInfo": "androidx/appcompat/widget/TintInfo",
       "android/support/v7/widget/AppCompatCompoundButtonHelper": "androidx/appcompat/widget/AppCompatCompoundButtonHelper",
+      "android/support/graphics/drawable/AnimatedVectorDrawableCompat": "androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat",
       "android/support/v7/widget/ThemeUtils": "androidx/appcompat/widget/ThemeUtils",
       "android/support/v7/widget/WithHint": "androidx/appcompat/widget/WithHint",
       "android/support/v7/widget/AppCompatPopupWindow": "androidx/appcompat/widget/AppCompatPopupWindow",
@@ -3708,23 +3626,115 @@
       "android/support/v7/widget/TintResources": "androidx/appcompat/widget/TintResources",
       "android/support/v7/widget/TooltipCompatHandler": "androidx/appcompat/widget/TooltipCompatHandler",
       "android/support/v7/widget/TooltipPopup": "androidx/appcompat/widget/TooltipPopup",
+      "android/support/percent/PercentFrameLayout": "androidx/percentlayout/widget/PercentFrameLayout",
+      "android/support/percent/PercentLayoutHelper": "androidx/percentlayout/widget/PercentLayoutHelper",
+      "android/support/percent/R": "androidx/percentlayout/R",
+      "android/support/percent/PercentRelativeLayout": "androidx/percentlayout/widget/PercentRelativeLayout",
+      "android/support/v14/preference/EditTextPreferenceDialogFragment": "androidx/preference/EditTextPreferenceDialogFragment",
+      "android/support/v14/preference/PreferenceDialogFragment": "androidx/preference/PreferenceDialogFragment",
+      "android/support/v7/preference/EditTextPreference": "androidx/preference/EditTextPreference",
+      "android/support/v14/preference/ListPreferenceDialogFragment": "androidx/preference/ListPreferenceDialogFragment",
+      "android/support/v7/preference/internal/AbstractMultiSelectListPreference": "androidx/preference/internal/AbstractMultiSelectListPreference",
+      "android/support/v7/preference/R": "androidx/preference/R",
+      "android/support/v14/preference/MultiSelectListPreferenceDialogFragment": "androidx/preference/MultiSelectListPreferenceDialogFragment",
+      "android/support/v7/preference/PreferenceGroup": "androidx/preference/PreferenceGroup",
+      "android/support/v7/preference/PreferenceViewHolder": "androidx/preference/PreferenceViewHolder",
+      "android/support/v7/preference/PreferenceManager": "androidx/preference/PreferenceManager",
+      "android/support/v7/preference/PreferenceGroupAdapter": "androidx/preference/PreferenceGroupAdapter",
+      "android/support/v14/preference/SwitchPreference": "androidx/preference/SwitchPreference",
+      "android/support/v7/preference/TwoStatePreference": "androidx/preference/TwoStatePreference",
+      "android/support/v7/internal/widget/PreferenceImageView": "androidx/preference/internal/PreferenceImageView",
+      "android/support/v7/preference/AndroidResources": "androidx/preference/AndroidResources",
+      "android/support/v7/preference/CheckBoxPreference": "androidx/preference/CheckBoxPreference",
+      "android/support/v7/preference/CollapsiblePreferenceGroupController": "androidx/preference/CollapsiblePreferenceGroupController",
+      "android/support/v7/preference/DropDownPreference": "androidx/preference/DropDownPreference",
+      "android/support/v7/preference/EditTextPreferenceDialogFragmentCompat": "androidx/preference/EditTextPreferenceDialogFragmentCompat",
+      "android/support/v7/preference/PreferenceDialogFragmentCompat": "androidx/preference/PreferenceDialogFragmentCompat",
+      "android/support/v7/preference/ListPreferenceDialogFragmentCompat": "androidx/preference/ListPreferenceDialogFragmentCompat",
+      "android/support/v7/preference/MultiSelectListPreferenceDialogFragmentCompat": "androidx/preference/MultiSelectListPreferenceDialogFragmentCompat",
+      "android/support/v7/preference/PreferenceDataStore": "androidx/preference/PreferenceDataStore",
+      "android/support/v7/preference/PreferenceCategory": "androidx/preference/PreferenceCategory",
+      "android/support/v7/preference/PreferenceFragmentCompat": "androidx/preference/PreferenceFragmentCompat",
+      "android/support/v7/preference/PreferenceInflater": "androidx/preference/PreferenceInflater",
+      "android/support/v7/preference/SeekBarPreference": "androidx/preference/SeekBarPreference",
+      "android/support/v7/preference/SwitchPreferenceCompat": "androidx/preference/SwitchPreferenceCompat",
+      "android/support/v7/preference/UnPressableLinearLayout": "androidx/preference/UnPressableLinearLayout",
+      "android/support/v4/app/BackStackRecord": "androidx/fragment/app/BackStackRecord",
+      "android/support/v4/app/FragmentManagerImpl": "androidx/fragment/app/FragmentManagerImpl",
+      "android/support/v4/app/FragmentHostCallback": "androidx/fragment/app/FragmentHostCallback",
+      "android/support/v4/app/FragmentTransition": "androidx/fragment/app/FragmentTransition",
+      "android/support/v4/app/BackStackState": "androidx/fragment/app/BackStackState",
+      "android/support/v4/app/BaseFragmentActivityApi14": "androidx/fragment/app/BaseFragmentActivityApi14",
+      "android/support/v4/app/BaseFragmentActivityApi16": "androidx/fragment/app/BaseFragmentActivityApi16",
+      "android/support/v4/app/FragmentContainer": "androidx/fragment/app/FragmentContainer",
+      "android/support/v4/app/FragmentManagerNonConfig": "androidx/fragment/app/FragmentManagerNonConfig",
+      "android/support/v4/app/SuperNotCalledException": "androidx/fragment/app/SuperNotCalledException",
+      "android/support/v4/app/FragmentController": "androidx/fragment/app/FragmentController",
+      "android/support/v4/app/FragmentState": "androidx/fragment/app/FragmentState",
+      "android/support/v4/app/FragmentManagerState": "androidx/fragment/app/FragmentManagerState",
+      "android/support/v4/app/FragmentPagerAdapter": "androidx/fragment/app/FragmentPagerAdapter",
+      "android/support/v4/app/FragmentStatePagerAdapter": "androidx/fragment/app/FragmentStatePagerAdapter",
+      "android/support/v4/app/FragmentTabHost": "androidx/fragment/app/FragmentTabHost",
+      "android/support/annotation/AnimRes": "androidx/annotation/AnimRes",
+      "android/support/v4/app/OneShotPreDrawListener": "androidx/fragment/app/OneShotPreDrawListener",
+      "android/support/v4/app/FragmentTransitionCompat21": "androidx/fragment/app/FragmentTransitionCompat21",
+      "android/support/v4/app/ListFragment": "androidx/fragment/app/ListFragment",
       "android/arch/core/executor/JunitTaskExecutorRule": "androidx/arch/core/executor/JunitTaskExecutorRule",
       "android/arch/core/executor/TaskExecutorWithFakeMainThread": "androidx/arch/core/executor/TaskExecutorWithFakeMainThread",
       "android/arch/core/executor/TaskExecutor": "androidx/arch/core/executor/TaskExecutor",
       "android/arch/core/executor/testing/CountingTaskExecutorRule": "androidx/arch/core/executor/testing/CountingTaskExecutorRule",
       "android/arch/core/executor/DefaultTaskExecutor": "androidx/arch/core/executor/DefaultTaskExecutor",
       "android/arch/core/executor/testing/InstantTaskExecutorRule": "androidx/arch/core/executor/testing/InstantTaskExecutorRule",
-      "android/support/text/emoji/widget/EmojiAppCompatButton": "androidx/emoji/widget/EmojiAppCompatButton",
-      "android/support/text/emoji/widget/EmojiAppCompatEditText": "androidx/emoji/widget/EmojiAppCompatEditText",
-      "android/support/text/emoji/widget/EmojiAppCompatTextView": "androidx/emoji/widget/EmojiAppCompatTextView",
-      "android/support/design/card/MaterialCardView": "android/support/design/card/MaterialCardView",
-      "android/support/design/card/R": "android/support/design/card/R",
-      "android/support/design/card/MaterialCardViewHelper": "android/support/design/card/MaterialCardViewHelper",
-      "android/arch/lifecycle/ClassesInfoCache": "androidx/lifecycle/ClassesInfoCache",
-      "android/arch/lifecycle/FullLifecycleObserverAdapter": "androidx/lifecycle/FullLifecycleObserverAdapter",
-      "android/arch/lifecycle/SingleGeneratedAdapterObserver": "androidx/lifecycle/SingleGeneratedAdapterObserver",
-      "android/arch/lifecycle/CompositeGeneratedAdaptersObserver": "androidx/lifecycle/CompositeGeneratedAdaptersObserver",
-      "android/arch/lifecycle/ReflectiveGenericLifecycleObserver": "androidx/lifecycle/ReflectiveGenericLifecycleObserver",
+      "android/support/multidex/MultiDex": "androidx/multidex/MultiDex",
+      "android/arch/paging/AsyncPagedListDiffer": "androidx/paging/AsyncPagedListDiffer",
+      "android/arch/paging/PagedStorageDiffHelper": "androidx/paging/PagedStorageDiffHelper",
+      "android/arch/paging/LivePagedListBuilder": "androidx/paging/LivePagedListBuilder",
+      "android/arch/paging/LivePagedListProvider": "androidx/paging/LivePagedListProvider",
+      "android/arch/paging/PagedListAdapter": "androidx/paging/PagedListAdapter",
+      "android/arch/lifecycle/LiveDataReactiveStreams": "androidx/lifecycle/LiveDataReactiveStreams",
+      "android/support/design/circularreveal/coordinatorlayout/CircularRevealCoordinatorLayout": "android/support/design/circularreveal/coordinatorlayout/CircularRevealCoordinatorLayout",
+      "android/support/multidex/ZipUtil": "androidx/multidex/ZipUtil",
+      "android/support/multidex/MultiDexExtractor": "androidx/multidex/MultiDexExtractor",
+      "android/support/multidex/MultiDexApplication": "androidx/multidex/MultiDexApplication",
+      "android/arch/persistence/room/EntityDeletionOrUpdateAdapter": "androidx/room/EntityDeletionOrUpdateAdapter",
+      "android/arch/persistence/room/SharedSQLiteStatement": "androidx/room/SharedSQLiteStatement",
+      "android/arch/persistence/db/SupportSQLiteStatement": "androidx/sqlite/db/SupportSQLiteStatement",
+      "android/arch/persistence/room/EntityInsertionAdapter": "androidx/room/EntityInsertionAdapter",
+      "android/arch/persistence/room/Room": "androidx/room/Room",
+      "android/arch/persistence/db/SimpleSQLiteQuery": "androidx/sqlite/db/SimpleSQLiteQuery",
+      "android/arch/persistence/db/SupportSQLiteQuery": "androidx/sqlite/db/SupportSQLiteQuery",
+      "android/arch/persistence/db/SupportSQLiteProgram": "androidx/sqlite/db/SupportSQLiteProgram",
+      "android/arch/persistence/room/paging/LimitOffsetDataSource": "androidx/room/paging/LimitOffsetDataSource",
+      "android/arch/persistence/room/util/StringUtil": "androidx/room/util/StringUtil",
+      "android/arch/lifecycle/DefaultLifecycleObserver": "androidx/lifecycle/DefaultLifecycleObserver",
+      "android/support/design/button/MaterialButton": "android/support/design/button/MaterialButton",
+      "android/support/design/button/R": "android/support/design/button/R",
+      "android/support/design/button/MaterialButtonHelper": "android/support/design/button/MaterialButtonHelper",
+      "android/support/design/button/MaterialButtonBackgroundDrawable": "android/support/design/button/MaterialButtonBackgroundDrawable",
+      "android/support/text/emoji/EmojiProcessor": "androidx/emoji/text/EmojiProcessor",
+      "android/support/text/emoji/EmojiMetadata": "androidx/emoji/text/EmojiMetadata",
+      "android/support/text/emoji/EmojiSpan": "androidx/emoji/text/EmojiSpan",
+      "android/support/text/emoji/TypefaceEmojiSpan": "androidx/emoji/text/TypefaceEmojiSpan",
+      "android/support/annotation/CheckResult": "androidx/annotation/CheckResult",
+      "android/support/text/emoji/widget/SpannableBuilder": "androidx/emoji/widget/SpannableBuilder",
+      "android/support/text/emoji/FontRequestEmojiCompatConfig": "androidx/emoji/text/FontRequestEmojiCompatConfig",
+      "android/support/text/emoji/MetadataListReader": "androidx/emoji/text/MetadataListReader",
+      "android/support/text/emoji/widget/EditTextAttributeHelper": "androidx/emoji/widget/EditTextAttributeHelper",
+      "android/support/text/emoji/R": "androidx/emoji/R",
+      "android/support/text/emoji/widget/EmojiButton": "androidx/emoji/widget/EmojiButton",
+      "android/support/text/emoji/widget/EmojiTextViewHelper": "androidx/emoji/widget/EmojiTextViewHelper",
+      "android/support/text/emoji/widget/EmojiEditText": "androidx/emoji/widget/EmojiEditText",
+      "android/support/text/emoji/widget/EmojiEditTextHelper": "androidx/emoji/widget/EmojiEditTextHelper",
+      "android/support/text/emoji/widget/EmojiTextWatcher": "androidx/emoji/widget/EmojiTextWatcher",
+      "android/support/text/emoji/widget/EmojiEditableFactory": "androidx/emoji/widget/EmojiEditableFactory",
+      "android/support/text/emoji/widget/EmojiKeyListener": "androidx/emoji/widget/EmojiKeyListener",
+      "android/support/text/emoji/widget/EmojiInputConnection": "androidx/emoji/widget/EmojiInputConnection",
+      "android/support/text/emoji/widget/EmojiExtractEditText": "androidx/emoji/widget/EmojiExtractEditText",
+      "android/support/text/emoji/widget/EmojiExtractTextLayout": "androidx/emoji/widget/EmojiExtractTextLayout",
+      "android/support/text/emoji/widget/ExtractButtonCompat": "androidx/emoji/widget/ExtractButtonCompat",
+      "android/support/text/emoji/widget/EmojiInputFilter": "androidx/emoji/widget/EmojiInputFilter",
+      "android/support/text/emoji/widget/EmojiTextView": "androidx/emoji/widget/EmojiTextView",
+      "android/support/text/emoji/widget/EmojiTransformationMethod": "androidx/emoji/widget/EmojiTransformationMethod",
       "android/support/customtabs/CustomTabsCallback": "androidx/browser/customtabs/CustomTabsCallback",
       "android/support/customtabs/CustomTabsClient": "androidx/browser/customtabs/CustomTabsClient",
       "android/support/customtabs/CustomTabsServiceConnection": "androidx/browser/customtabs/CustomTabsServiceConnection",
@@ -3739,34 +3749,38 @@
       "android/support/customtabs/PostMessageServiceConnection": "androidx/browser/customtabs/PostMessageServiceConnection",
       "android/support/customtabs/TrustedWebUtils": "androidx/browser/customtabs/TrustedWebUtils",
       "android/support/customtabs/R": "androidx/browser/R",
-      "android/arch/lifecycle/AndroidViewModel": "androidx/lifecycle/AndroidViewModel",
-      "android/support/design/circularreveal/coordinatorlayout/CircularRevealCoordinatorLayout": "android/support/design/circularreveal/coordinatorlayout/CircularRevealCoordinatorLayout",
-      "android/support/percent/PercentFrameLayout": "androidx/percentlayout/widget/PercentFrameLayout",
-      "android/support/percent/PercentLayoutHelper": "androidx/percentlayout/widget/PercentLayoutHelper",
-      "android/support/percent/R": "androidx/percentlayout/R",
-      "android/support/percent/PercentRelativeLayout": "androidx/percentlayout/widget/PercentRelativeLayout",
+      "android/arch/persistence/db/framework/FrameworkSQLiteDatabase": "androidx/sqlite/db/framework/FrameworkSQLiteDatabase",
+      "android/arch/persistence/db/framework/FrameworkSQLiteProgram": "androidx/sqlite/db/framework/FrameworkSQLiteProgram",
+      "android/arch/persistence/db/framework/FrameworkSQLiteStatement": "androidx/sqlite/db/framework/FrameworkSQLiteStatement",
+      "android/arch/persistence/db/framework/FrameworkSQLiteOpenHelper": "androidx/sqlite/db/framework/FrameworkSQLiteOpenHelper",
+      "android/support/v7/widget/GridLayout": "androidx/gridlayout/widget/GridLayout",
+      "android/support/v7/gridlayout/R": "androidx/gridlayout/R",
       "android/arch/persistence/db/SupportSQLiteQueryBuilder": "androidx/sqlite/db/SupportSQLiteQueryBuilder",
-      "android/support/design/animation/R": "android/support/design/animation/R",
-      "android/arch/paging/PageResult": "androidx/paging/PageResult",
-      "android/arch/paging/ListDataSource": "androidx/paging/ListDataSource",
-      "android/arch/paging/WrapperItemKeyedDataSource": "androidx/paging/WrapperItemKeyedDataSource",
-      "android/arch/paging/PageKeyedDataSource": "androidx/paging/PageKeyedDataSource",
-      "android/arch/paging/ContiguousDataSource": "androidx/paging/ContiguousDataSource",
-      "android/arch/paging/WrapperPageKeyedDataSource": "androidx/paging/WrapperPageKeyedDataSource",
-      "android/arch/paging/ItemKeyedDataSource": "androidx/paging/ItemKeyedDataSource",
-      "android/arch/paging/TiledPagedList": "androidx/paging/TiledPagedList",
-      "android/arch/paging/TiledDataSource": "androidx/paging/TiledDataSource",
-      "android/arch/paging/WrapperPositionalDataSource": "androidx/paging/WrapperPositionalDataSource",
-      "android/arch/paging/ContiguousPagedList": "androidx/paging/ContiguousPagedList",
-      "android/arch/paging/SnapshotPagedList": "androidx/paging/SnapshotPagedList",
-      "android/support/v4/view/AsyncLayoutInflater": "androidx/asynclayoutinflater/view/AsyncLayoutInflater",
-      "android/arch/persistence/room/ForeignKey": "androidx/room/ForeignKey",
-      "android/arch/persistence/room/RoomWarnings": "androidx/room/RoomWarnings",
-      "android/arch/persistence/room/Index": "androidx/room/Index",
-      "android/arch/persistence/room/OnConflictStrategy": "androidx/room/OnConflictStrategy",
-      "android/support/design/circularreveal/CircularRevealGridLayout": "android/support/design/circularreveal/CircularRevealGridLayout",
-      "android/support/design/circularreveal/CircularRevealLinearLayout": "android/support/design/circularreveal/CircularRevealLinearLayout",
-      "android/support/design/circularreveal/CircularRevealRelativeLayout": "android/support/design/circularreveal/CircularRevealRelativeLayout"
+      "android/support/v13/app/ActivityCompat": "androidx/legacy/app/ActivityCompat",
+      "android/support/v13/app/FragmentCompat": "androidx/legacy/app/FragmentCompat",
+      "android/support/v13/app/FragmentPagerAdapter": "androidx/legacy/app/FragmentPagerAdapter",
+      "android/support/v13/app/FragmentStatePagerAdapter": "androidx/legacy/app/FragmentStatePagerAdapter",
+      "android/support/v13/app/FragmentTabHost": "androidx/legacy/app/FragmentTabHost",
+      "android/support/v13/view/ViewCompat": "androidx/legacy/view/ViewCompat",
+      "android/support/annotation/BinderThread": "androidx/annotation/BinderThread",
+      "android/support/annotation/ColorLong": "androidx/annotation/ColorLong",
+      "android/support/annotation/HalfFloat": "androidx/annotation/HalfFloat",
+      "android/support/annotation/IntDef": "androidx/annotation/IntDef",
+      "android/support/annotation/InterpolatorRes": "androidx/annotation/InterpolatorRes",
+      "android/support/annotation/LongDef": "androidx/annotation/LongDef",
+      "android/support/annotation/NavigationRes": "androidx/annotation/NavigationRes",
+      "android/support/annotation/PluralsRes": "androidx/annotation/PluralsRes",
+      "android/support/annotation/RawRes": "androidx/annotation/RawRes",
+      "android/support/annotation/StringDef": "androidx/annotation/StringDef",
+      "android/support/annotation/TransitionRes": "androidx/annotation/TransitionRes",
+      "android/support/text/emoji/widget/EmojiAppCompatButton": "androidx/emoji/widget/EmojiAppCompatButton",
+      "android/support/text/emoji/widget/EmojiAppCompatEditText": "androidx/emoji/widget/EmojiAppCompatEditText",
+      "android/support/text/emoji/widget/EmojiAppCompatTextView": "androidx/emoji/widget/EmojiAppCompatTextView",
+      "android/support/graphics/drawable/Animatable2Compat": "androidx/vectordrawable/graphics/drawable/Animatable2Compat",
+      "android/support/graphics/drawable/AnimatorInflaterCompat": "androidx/vectordrawable/graphics/drawable/AnimatorInflaterCompat",
+      "android/support/graphics/drawable/AnimationUtilsCompat": "androidx/vectordrawable/graphics/drawable/AnimationUtilsCompat",
+      "android/support/graphics/drawable/PathInterpolatorCompat": "androidx/vectordrawable/graphics/drawable/PathInterpolatorCompat",
+      "android/support/graphics/drawable/ArgbEvaluator": "androidx/vectordrawable/graphics/drawable/ArgbEvaluator"
     }
   },
   "proGuardMap": {
diff --git a/samples/SupportSliceDemos/src/main/java/com/example/androidx/slice/demos/SampleSliceProvider.java b/samples/SupportSliceDemos/src/main/java/com/example/androidx/slice/demos/SampleSliceProvider.java
index b49dc7f..0beb745 100644
--- a/samples/SupportSliceDemos/src/main/java/com/example/androidx/slice/demos/SampleSliceProvider.java
+++ b/samples/SupportSliceDemos/src/main/java/com/example/androidx/slice/demos/SampleSliceProvider.java
@@ -567,16 +567,18 @@
     private Slice createStarRatingInputRange(Uri sliceUri) {
         IconCompat icon = IconCompat.createWithResource(getContext(), R.drawable.ic_star_on);
         SliceAction primaryAction =
-                new SliceAction(getBroadcastIntent(ACTION_TOAST, "open star rating"), icon, "Rate");
+                new SliceAction(getBroadcastIntent(ACTION_TOAST, "open star rating"),
+                        icon, "Rate");
         return new ListBuilder(getContext(), sliceUri, INFINITY)
                 .setColor(0xffff4081)
                 .addInputRange(c -> c
                         .setTitle("Star rating")
-                        .setSubtitle("Pick a rating from 0 to 5")
+                        .setSubtitle("Rate from 5 to 10 because it's weird")
+                        .setMin(5)
                         .setThumb(icon)
                         .setInputAction(getBroadcastIntent(ACTION_TOAST_RANGE_VALUE, null))
-                        .setMax(5)
-                        .setValue(3)
+                        .setMax(10)
+                        .setValue(8)
                         .setPrimaryAction(primaryAction)
                         .setContentDescription("Slider for star ratings"))
                 .build();
diff --git a/samples/SupportSliceDemos/src/main/java/com/example/androidx/slice/demos/SliceBroadcastReceiver.java b/samples/SupportSliceDemos/src/main/java/com/example/androidx/slice/demos/SliceBroadcastReceiver.java
index 914b843..2eca3ef 100644
--- a/samples/SupportSliceDemos/src/main/java/com/example/androidx/slice/demos/SliceBroadcastReceiver.java
+++ b/samples/SupportSliceDemos/src/main/java/com/example/androidx/slice/demos/SliceBroadcastReceiver.java
@@ -16,10 +16,9 @@
 
 package com.example.androidx.slice.demos;
 
+import static android.app.slice.Slice.EXTRA_RANGE_VALUE;
 import static android.app.slice.Slice.EXTRA_TOGGLE_STATE;
 
-import static androidx.slice.core.SliceHints.EXTRA_RANGE_VALUE;
-
 import static com.example.androidx.slice.demos.SampleSliceProvider.getUri;
 
 import android.content.BroadcastReceiver;
diff --git a/slices/builders/api/current.txt b/slices/builders/api/current.txt
index 4538b46..1041eb9 100644
--- a/slices/builders/api/current.txt
+++ b/slices/builders/api/current.txt
@@ -111,6 +111,7 @@
     method public androidx.slice.builders.ListBuilder.InputRangeBuilder setContentDescription(java.lang.CharSequence);
     method public androidx.slice.builders.ListBuilder.InputRangeBuilder setInputAction(android.app.PendingIntent);
     method public androidx.slice.builders.ListBuilder.InputRangeBuilder setMax(int);
+    method public androidx.slice.builders.ListBuilder.InputRangeBuilder setMin(int);
     method public androidx.slice.builders.ListBuilder.InputRangeBuilder setPrimaryAction(androidx.slice.builders.SliceAction);
     method public androidx.slice.builders.ListBuilder.InputRangeBuilder setSubtitle(java.lang.CharSequence);
     method public deprecated androidx.slice.builders.ListBuilder.InputRangeBuilder setThumb(android.graphics.drawable.Icon);
diff --git a/slices/builders/src/main/java/androidx/slice/builders/ListBuilder.java b/slices/builders/src/main/java/androidx/slice/builders/ListBuilder.java
index d59aead..1c81ebd 100644
--- a/slices/builders/src/main/java/androidx/slice/builders/ListBuilder.java
+++ b/slices/builders/src/main/java/androidx/slice/builders/ListBuilder.java
@@ -42,7 +42,6 @@
 import java.lang.annotation.RetentionPolicy;
 import java.util.List;
 
-
 /**
  * A slice can be constructed with ListBuilder.
  * <p>
@@ -656,6 +655,15 @@
         }
 
         /**
+         * Set the lower limit of the range. The default is 0.
+         */
+        @NonNull
+        public InputRangeBuilder setMin(int min) {
+            mImpl.setMin(min);
+            return this;
+        }
+
+        /**
          * Set the upper limit of the range. The default is 100.
          */
         @NonNull
diff --git a/slices/builders/src/main/java/androidx/slice/builders/impl/ListBuilder.java b/slices/builders/src/main/java/androidx/slice/builders/impl/ListBuilder.java
index 084b85a..80a477e 100644
--- a/slices/builders/src/main/java/androidx/slice/builders/impl/ListBuilder.java
+++ b/slices/builders/src/main/java/androidx/slice/builders/impl/ListBuilder.java
@@ -141,6 +141,11 @@
      */
     interface RangeBuilder {
         /**
+         * Set the lower limit.
+         */
+        void setMin(int min);
+
+        /**
          * Set the upper limit.
          */
         void setMax(int max);
diff --git a/slices/builders/src/main/java/androidx/slice/builders/impl/ListBuilderV1Impl.java b/slices/builders/src/main/java/androidx/slice/builders/impl/ListBuilderV1Impl.java
index f2ff884..c771b62 100644
--- a/slices/builders/src/main/java/androidx/slice/builders/impl/ListBuilderV1Impl.java
+++ b/slices/builders/src/main/java/androidx/slice/builders/impl/ListBuilderV1Impl.java
@@ -27,6 +27,9 @@
 import static android.app.slice.Slice.HINT_TITLE;
 import static android.app.slice.Slice.SUBTYPE_COLOR;
 import static android.app.slice.Slice.SUBTYPE_CONTENT_DESCRIPTION;
+import static android.app.slice.Slice.SUBTYPE_MAX;
+import static android.app.slice.Slice.SUBTYPE_RANGE;
+import static android.app.slice.Slice.SUBTYPE_VALUE;
 import static android.app.slice.SliceItem.FORMAT_TEXT;
 
 import static androidx.annotation.RestrictTo.Scope.LIBRARY;
@@ -36,10 +39,8 @@
 import static androidx.slice.core.SliceHints.HINT_KEYWORDS;
 import static androidx.slice.core.SliceHints.HINT_LAST_UPDATED;
 import static androidx.slice.core.SliceHints.HINT_TTL;
-import static androidx.slice.core.SliceHints.SUBTYPE_MAX;
 import static androidx.slice.core.SliceHints.SUBTYPE_MILLIS;
-import static androidx.slice.core.SliceHints.SUBTYPE_RANGE;
-import static androidx.slice.core.SliceHints.SUBTYPE_VALUE;
+import static androidx.slice.core.SliceHints.SUBTYPE_MIN;
 
 import android.app.PendingIntent;
 import android.net.Uri;
@@ -158,6 +159,7 @@
      * Builder to construct an input row.
      */
     public static class RangeBuilderImpl extends TemplateBuilderImpl implements RangeBuilder {
+        private int mMin = 0;
         private int mMax = 100;
         private int mValue = 0;
         private CharSequence mTitle;
@@ -170,6 +172,11 @@
         }
 
         @Override
+        public void setMin(int min) {
+            mMin = min;
+        }
+
+        @Override
         public void setMax(int max) {
             mMax = max;
         }
@@ -216,6 +223,7 @@
                 builder.addSubSlice(mPrimaryAction.buildSlice(sb), null /* subtype */);
             }
             builder.addHints(HINT_LIST_ITEM)
+                    .addInt(mMin, SUBTYPE_MIN)
                     .addInt(mMax, SUBTYPE_MAX)
                     .addInt(mValue, SUBTYPE_VALUE);
         }
diff --git a/slices/core/src/main/java/androidx/slice/core/SliceHints.java b/slices/core/src/main/java/androidx/slice/core/SliceHints.java
index f546b6c..c29ad56 100644
--- a/slices/core/src/main/java/androidx/slice/core/SliceHints.java
+++ b/slices/core/src/main/java/androidx/slice/core/SliceHints.java
@@ -31,25 +31,11 @@
  */
 @RestrictTo(LIBRARY_GROUP)
 public class SliceHints {
-    /**
-     * Subtype to range an item representing a range.
-     */
-    public static final String SUBTYPE_RANGE = "range";
 
     /**
-     * Subtype indicating that this content is the maximum value for a range.
+     * Subtype indicating that this content is the minimum value for a range.
      */
-    public static final String SUBTYPE_MAX = "max";
-
-    /**
-     * Subtype indicating that this content is the current value for a range.
-     */
-    public static final String SUBTYPE_VALUE = "value";
-
-    /**
-     * Key to retrieve an extra added to an intent when the value of an input range has changed.
-     */
-    public static final String EXTRA_RANGE_VALUE = "android.app.slice.extra.RANGE_VALUE";
+    public static final String SUBTYPE_MIN = "min";
 
     /**
      * The meta-data key that allows an activity to easily be linked directly to a slice.
diff --git a/slices/view/api/current.txt b/slices/view/api/current.txt
index 65d5faa..4d97ef2 100644
--- a/slices/view/api/current.txt
+++ b/slices/view/api/current.txt
@@ -28,6 +28,7 @@
     method public int getLoadingState();
     method public androidx.slice.core.SliceAction getPrimaryAction();
     method public androidx.core.util.Pair<java.lang.Integer, java.lang.Integer> getRange();
+    method public int getRangeValue();
     method public java.util.List<androidx.slice.SliceItem> getSliceActions();
     method public java.util.List<java.lang.String> getSliceKeywords();
     method public java.util.List<androidx.slice.core.SliceAction> getToggles();
diff --git a/slices/view/src/androidTest/java/androidx/slice/SliceMetadataTest.java b/slices/view/src/androidTest/java/androidx/slice/SliceMetadataTest.java
index ac3d214..650114e 100644
--- a/slices/view/src/androidTest/java/androidx/slice/SliceMetadataTest.java
+++ b/slices/view/src/androidTest/java/androidx/slice/SliceMetadataTest.java
@@ -451,15 +451,20 @@
         ListBuilder lb = new ListBuilder(mContext, uri, ListBuilder.INFINITY);
         lb.addInputRange(new ListBuilder.InputRangeBuilder(lb)
                 .setTitle("another title")
-                .setValue(5)
+                .setValue(7)
+                .setMin(5)
                 .setMax(10)
-                .setAction(pi));
+                .setInputAction(pi));
 
         Slice sliderSlice = lb.build();
         SliceMetadata sliderInfo = SliceMetadata.from(mContext, sliderSlice);
+
         Pair<Integer, Integer> values = sliderInfo.getRange();
         assertEquals(5, (int) values.first);
         assertEquals(10, (int) values.second);
+
+        int currentValue = sliderInfo.getRangeValue();
+        assertEquals(7, currentValue);
     }
 
     @Test
@@ -475,9 +480,8 @@
         Slice sliderSlice = lb.build();
         SliceMetadata progressInfo = SliceMetadata.from(mContext, sliderSlice);
         Pair<Integer, Integer> values = progressInfo.getRange();
-        assertEquals(5, (int) values.first);
+        assertEquals(0, (int) values.first);
         assertEquals(10, (int) values.second);
-
     }
 
     @Test
diff --git a/slices/view/src/androidTest/java/androidx/slice/render/SliceCreator.java b/slices/view/src/androidTest/java/androidx/slice/render/SliceCreator.java
index f2e52da..2312b36 100644
--- a/slices/view/src/androidTest/java/androidx/slice/render/SliceCreator.java
+++ b/slices/view/src/androidTest/java/androidx/slice/render/SliceCreator.java
@@ -486,9 +486,10 @@
                         .setTitle("Star rating")
                         .setSubtitle("Pick a rating from 0 to 5")
                         .setThumb(icon)
+                        .setMin(5)
                         .setInputAction(getBroadcastIntent(ACTION_TOAST, "range changed"))
-                        .setMax(5)
-                        .setValue(3)
+                        .setMax(10)
+                        .setValue(7)
                         .setPrimaryAction(primaryAction)
                         .setContentDescription("Slider for star ratings"))
                 .build();
diff --git a/slices/view/src/main/java/androidx/slice/SliceMetadata.java b/slices/view/src/main/java/androidx/slice/SliceMetadata.java
index d8258bf..8a4ee03 100644
--- a/slices/view/src/main/java/androidx/slice/SliceMetadata.java
+++ b/slices/view/src/main/java/androidx/slice/SliceMetadata.java
@@ -20,6 +20,8 @@
 import static android.app.slice.Slice.HINT_HORIZONTAL;
 import static android.app.slice.Slice.HINT_PARTIAL;
 import static android.app.slice.Slice.HINT_SHORTCUT;
+import static android.app.slice.Slice.SUBTYPE_MAX;
+import static android.app.slice.Slice.SUBTYPE_VALUE;
 import static android.app.slice.SliceItem.FORMAT_INT;
 import static android.app.slice.SliceItem.FORMAT_SLICE;
 import static android.app.slice.SliceItem.FORMAT_TEXT;
@@ -29,8 +31,7 @@
 import static androidx.slice.core.SliceHints.HINT_LAST_UPDATED;
 import static androidx.slice.core.SliceHints.HINT_PERMISSION_REQUEST;
 import static androidx.slice.core.SliceHints.HINT_TTL;
-import static androidx.slice.core.SliceHints.SUBTYPE_MAX;
-import static androidx.slice.core.SliceHints.SUBTYPE_VALUE;
+import static androidx.slice.core.SliceHints.SUBTYPE_MIN;
 import static androidx.slice.widget.EventInfo.ROW_TYPE_PROGRESS;
 import static androidx.slice.widget.EventInfo.ROW_TYPE_SLIDER;
 
@@ -199,7 +200,7 @@
      * Gets the range information associated with a progress bar or input range associated with this
      * slice, if it exists.
      *
-     * @return a pair where the first item is the current value of the range and the second item is
+     * @return a pair where the first item is the minimum value of the range and the second item is
      * the maximum value of the range.
      */
     @Nullable
@@ -209,15 +210,34 @@
             RowContent rc = new RowContent(mContext, mHeaderItem, true /* isHeader */);
             SliceItem range = rc.getRange();
             SliceItem maxItem = SliceQuery.findSubtype(range, FORMAT_INT, SUBTYPE_MAX);
-            SliceItem currentItem = SliceQuery.findSubtype(range, FORMAT_INT, SUBTYPE_VALUE);
-            int max = maxItem != null ? maxItem.getInt() : -1;
-            int current = currentItem != null ? currentItem.getInt() : -1;
-            return new Pair<>(current, max);
+            SliceItem minItem = SliceQuery.findSubtype(range, FORMAT_INT, SUBTYPE_MIN);
+            int max = maxItem != null ? maxItem.getInt() : 100; // default max of range
+            int min = minItem != null ? minItem.getInt() : 0; // default min of range
+            return new Pair<>(min, max);
         }
         return null;
     }
 
     /**
+     * Gets the current value for a progress bar or input range associated with this slice, if it
+     * exists, -1 if unknown.
+     *
+     * @return the current value of a progress bar or input range associated with this slice.
+     */
+    @NonNull
+    public int getRangeValue() {
+        if (mTemplateType == ROW_TYPE_SLIDER
+                || mTemplateType == ROW_TYPE_PROGRESS) {
+            RowContent rc = new RowContent(mContext, mHeaderItem, true /* isHeader */);
+            SliceItem range = rc.getRange();
+            SliceItem currentItem = SliceQuery.findSubtype(range, FORMAT_INT, SUBTYPE_VALUE);
+            return currentItem != null ? currentItem.getInt() : -1;
+        }
+        return -1;
+
+    }
+
+    /**
      * @return the list of keywords associated with the provided slice, null if no keywords were
      * specified or an empty list if the slice was specified to have no keywords.
      */
diff --git a/slices/view/src/main/java/androidx/slice/widget/RowContent.java b/slices/view/src/main/java/androidx/slice/widget/RowContent.java
index 728715e..0076a3e 100644
--- a/slices/view/src/main/java/androidx/slice/widget/RowContent.java
+++ b/slices/view/src/main/java/androidx/slice/widget/RowContent.java
@@ -23,6 +23,7 @@
 import static android.app.slice.Slice.HINT_SUMMARY;
 import static android.app.slice.Slice.HINT_TITLE;
 import static android.app.slice.Slice.SUBTYPE_CONTENT_DESCRIPTION;
+import static android.app.slice.Slice.SUBTYPE_RANGE;
 import static android.app.slice.SliceItem.FORMAT_ACTION;
 import static android.app.slice.SliceItem.FORMAT_IMAGE;
 import static android.app.slice.SliceItem.FORMAT_INT;
@@ -34,7 +35,6 @@
 import static androidx.slice.core.SliceHints.HINT_KEYWORDS;
 import static androidx.slice.core.SliceHints.HINT_LAST_UPDATED;
 import static androidx.slice.core.SliceHints.HINT_TTL;
-import static androidx.slice.core.SliceHints.SUBTYPE_RANGE;
 
 import android.content.Context;
 import android.text.TextUtils;
diff --git a/slices/view/src/main/java/androidx/slice/widget/RowView.java b/slices/view/src/main/java/androidx/slice/widget/RowView.java
index f1b6c06..2c3c53d 100644
--- a/slices/view/src/main/java/androidx/slice/widget/RowView.java
+++ b/slices/view/src/main/java/androidx/slice/widget/RowView.java
@@ -16,22 +16,23 @@
 
 package androidx.slice.widget;
 
+import static android.app.slice.Slice.EXTRA_RANGE_VALUE;
 import static android.app.slice.Slice.HINT_LIST_ITEM;
 import static android.app.slice.Slice.HINT_NO_TINT;
 import static android.app.slice.Slice.HINT_PARTIAL;
 import static android.app.slice.Slice.HINT_SHORTCUT;
+import static android.app.slice.Slice.SUBTYPE_MAX;
 import static android.app.slice.Slice.SUBTYPE_TOGGLE;
+import static android.app.slice.Slice.SUBTYPE_VALUE;
 import static android.app.slice.SliceItem.FORMAT_ACTION;
 import static android.app.slice.SliceItem.FORMAT_IMAGE;
 import static android.app.slice.SliceItem.FORMAT_INT;
 import static android.app.slice.SliceItem.FORMAT_SLICE;
 import static android.app.slice.SliceItem.FORMAT_TIMESTAMP;
 
-import static androidx.slice.core.SliceHints.EXTRA_RANGE_VALUE;
 import static androidx.slice.core.SliceHints.ICON_IMAGE;
 import static androidx.slice.core.SliceHints.SMALL_IMAGE;
-import static androidx.slice.core.SliceHints.SUBTYPE_MAX;
-import static androidx.slice.core.SliceHints.SUBTYPE_VALUE;
+import static androidx.slice.core.SliceHints.SUBTYPE_MIN;
 import static androidx.slice.widget.EventInfo.ACTION_TYPE_BUTTON;
 import static androidx.slice.widget.EventInfo.ACTION_TYPE_TOGGLE;
 import static androidx.slice.widget.EventInfo.ROW_TYPE_LIST;
@@ -326,20 +327,26 @@
     private void addRange(final SliceItem range) {
         final boolean isSeekBar = FORMAT_ACTION.equals(range.getFormat());
         final ProgressBar progressBar = isSeekBar ? mSeekBar : mProgressBar;
-        SliceItem max = SliceQuery.findSubtype(range, FORMAT_INT, SUBTYPE_MAX);
-        if (max != null) {
-            progressBar.setMax(max.getInt());
-        }
-        SliceItem progress = SliceQuery.findSubtype(range, FORMAT_INT, SUBTYPE_VALUE);
-        if (progress != null) {
-            progressBar.setProgress(progress.getInt());
-        }
-        progressBar.setVisibility(View.VISIBLE);
         if (mTintColor != -1) {
             Drawable drawable = DrawableCompat.wrap(progressBar.getProgressDrawable());
             DrawableCompat.setTint(drawable, mTintColor);
-            mProgressBar.setProgressDrawable(drawable);
+            progressBar.setProgressDrawable(drawable);
         }
+        // TODO: Need to handle custom accessibility for min
+        SliceItem min = SliceQuery.findSubtype(range, FORMAT_INT, SUBTYPE_MIN);
+        int minValue = 0;
+        if (min != null) {
+            minValue = min.getInt();
+        }
+        SliceItem max = SliceQuery.findSubtype(range, FORMAT_INT, SUBTYPE_MAX);
+        if (max != null) {
+            progressBar.setMax(max.getInt() - minValue);
+        }
+        SliceItem progress = SliceQuery.findSubtype(range, FORMAT_INT, SUBTYPE_VALUE);
+        if (progress != null) {
+            progressBar.setProgress(progress.getInt() - minValue);
+        }
+        progressBar.setVisibility(View.VISIBLE);
         if (isSeekBar) {
             SliceItem thumb = SliceQuery.find(range, FORMAT_IMAGE);
             if (thumb != null) {
@@ -350,9 +357,11 @@
                 DrawableCompat.setTint(drawable, mTintColor);
                 mSeekBar.setThumb(drawable);
             }
+            final int finalMinValue = minValue;
             mSeekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
                 @Override
                 public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
+                    progress += finalMinValue;
                     try {
                         // TODO: sending this PendingIntent should be rate limited.
                         range.fireAction(getContext(),
diff --git a/webkit/api/current.txt b/webkit/api/current.txt
index 5271a24..b565173 100644
--- a/webkit/api/current.txt
+++ b/webkit/api/current.txt
@@ -56,6 +56,17 @@
 
   public class WebViewFeature {
     method public static boolean isFeatureSupported(java.lang.String);
+    field public static final java.lang.String DISABLED_ACTION_MODE_MENU_ITEMS = "DISABLED_ACTION_MODE_MENU_ITEMS";
+    field public static final java.lang.String OFF_SCREEN_PRERASTER = "OFF_SCREEN_PRERASTER";
+    field public static final java.lang.String SAFE_BROWSING_ENABLE = "SAFE_BROWSING_ENABLE";
+    field public static final java.lang.String SAFE_BROWSING_PRIVACY_POLICY_URL = "SAFE_BROWSING_PRIVACY_POLICY_URL";
+    field public static final java.lang.String SAFE_BROWSING_WHITELIST = "SAFE_BROWSING_WHITELIST";
+    field public static final java.lang.String SERVICE_WORKER_BASIC_USAGE = "SERVICE_WORKER_BASIC_USAGE";
+    field public static final java.lang.String SERVICE_WORKER_BLOCK_NETWORK_LOADS = "SERVICE_WORKER_BLOCK_NETWORK_LOADS";
+    field public static final java.lang.String SERVICE_WORKER_CACHE_MODE = "SERVICE_WORKER_CACHE_MODE";
+    field public static final java.lang.String SERVICE_WORKER_CONTENT_ACCESS = "SERVICE_WORKER_CONTENT_ACCESS";
+    field public static final java.lang.String SERVICE_WORKER_FILE_ACCESS = "SERVICE_WORKER_FILE_ACCESS";
+    field public static final java.lang.String START_SAFE_BROWSING = "START_SAFE_BROWSING";
     field public static final java.lang.String VISUAL_STATE_CALLBACK = "VISUAL_STATE_CALLBACK";
   }
 
diff --git a/webkit/src/main/java/androidx/webkit/ServiceWorkerControllerCompat.java b/webkit/src/main/java/androidx/webkit/ServiceWorkerControllerCompat.java
index 3eb55d2..8d9d683 100644
--- a/webkit/src/main/java/androidx/webkit/ServiceWorkerControllerCompat.java
+++ b/webkit/src/main/java/androidx/webkit/ServiceWorkerControllerCompat.java
@@ -22,13 +22,13 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
+import androidx.annotation.RequiresFeature;
 import androidx.annotation.RestrictTo;
 import androidx.webkit.internal.FrameworkServiceWorkerController;
 import androidx.webkit.internal.ServiceWorkerControllerAdapter;
+import androidx.webkit.internal.WebViewFeatureInternal;
 import androidx.webkit.internal.WebViewGlueCommunicator;
 
-// TODO(gsennton) guard APIs with isFeatureSupported(String)
-
 /**
  * Manages Service Workers used by WebView.
  *
@@ -61,14 +61,27 @@
      * @return the default ServiceWorkerController instance
      */
     @NonNull
+    @RequiresFeature(name = WebViewFeature.SERVICE_WORKER_BASIC_USAGE,
+            enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
     public static ServiceWorkerControllerCompat getInstance() {
         return LAZY_HOLDER.INSTANCE;
     }
 
     private static class LAZY_HOLDER {
-        static final ServiceWorkerControllerCompat INSTANCE =
-                Build.VERSION.SDK_INT >= Build.VERSION_CODES.N
-                        ? getFrameworkControllerCompat() : getSupportLibraryControllerCompat();
+        static final ServiceWorkerControllerCompat INSTANCE = createController();
+
+        @SuppressWarnings("NewApi")
+        private static ServiceWorkerControllerCompat createController() {
+            WebViewFeatureInternal webviewFeature =
+                    WebViewFeatureInternal.getFeature(WebViewFeature.SERVICE_WORKER_BASIC_USAGE);
+            if (webviewFeature.isSupportedByFramework()) {
+                return getFrameworkControllerCompat();
+            } else if (webviewFeature.isSupportedByWebView()) {
+                return getSupportLibraryControllerCompat();
+            } else {
+                throw WebViewFeatureInternal.getUnsupportedOperationException();
+            }
+        }
     }
 
     /**
diff --git a/webkit/src/main/java/androidx/webkit/ServiceWorkerWebSettingsCompat.java b/webkit/src/main/java/androidx/webkit/ServiceWorkerWebSettingsCompat.java
index 61c46c3..6763db4 100644
--- a/webkit/src/main/java/androidx/webkit/ServiceWorkerWebSettingsCompat.java
+++ b/webkit/src/main/java/androidx/webkit/ServiceWorkerWebSettingsCompat.java
@@ -19,6 +19,7 @@
 import android.webkit.WebSettings;
 
 import androidx.annotation.IntDef;
+import androidx.annotation.RequiresFeature;
 import androidx.annotation.RestrictTo;
 
 import java.lang.annotation.Retention;
@@ -58,6 +59,8 @@
      * {@link WebSettings#LOAD_DEFAULT}.
      *
      */
+    @RequiresFeature(name = WebViewFeature.SERVICE_WORKER_CACHE_MODE,
+            enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
     public abstract void setCacheMode(@CacheMode int mode);
 
     /**
@@ -68,6 +71,8 @@
      * @see #setCacheMode
      *
      */
+    @RequiresFeature(name = WebViewFeature.SERVICE_WORKER_CACHE_MODE,
+            enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
     public abstract @CacheMode int getCacheMode();
 
     /**
@@ -76,6 +81,8 @@
      * {@link WebSettings#setAllowContentAccess}.
      *
      */
+    @RequiresFeature(name = WebViewFeature.SERVICE_WORKER_CONTENT_ACCESS,
+            enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
     public abstract void setAllowContentAccess(boolean allow);
 
     /**
@@ -85,6 +92,8 @@
      * @see #setAllowContentAccess
      *
      */
+    @RequiresFeature(name = WebViewFeature.SERVICE_WORKER_CONTENT_ACCESS,
+            enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
     public abstract boolean getAllowContentAccess();
 
     /**
@@ -93,6 +102,8 @@
      * {@link WebSettings#setAllowFileAccess}.
      *
      */
+    @RequiresFeature(name = WebViewFeature.SERVICE_WORKER_FILE_ACCESS,
+            enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
     public abstract void setAllowFileAccess(boolean allow);
 
     /**
@@ -102,6 +113,8 @@
      * @see #setAllowFileAccess
      *
      */
+    @RequiresFeature(name = WebViewFeature.SERVICE_WORKER_FILE_ACCESS,
+            enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
     public abstract boolean getAllowFileAccess();
 
     /**
@@ -112,6 +125,8 @@
      * @param flag {@code true} means block network loads by the Service Workers
      *
      */
+    @RequiresFeature(name = WebViewFeature.SERVICE_WORKER_BLOCK_NETWORK_LOADS,
+            enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
     public abstract void setBlockNetworkLoads(boolean flag);
 
     /**
@@ -123,5 +138,7 @@
      * @see #setBlockNetworkLoads
      *
      */
+    @RequiresFeature(name = WebViewFeature.SERVICE_WORKER_BLOCK_NETWORK_LOADS,
+            enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
     public abstract boolean getBlockNetworkLoads();
 }
diff --git a/webkit/src/main/java/androidx/webkit/WebSettingsCompat.java b/webkit/src/main/java/androidx/webkit/WebSettingsCompat.java
index 12d7e63..bff6170 100644
--- a/webkit/src/main/java/androidx/webkit/WebSettingsCompat.java
+++ b/webkit/src/main/java/androidx/webkit/WebSettingsCompat.java
@@ -16,27 +16,27 @@
 
 package androidx.webkit;
 
-import android.os.Build;
+import android.annotation.SuppressLint;
 import android.webkit.WebSettings;
 
+import androidx.annotation.IntDef;
+import androidx.annotation.RequiresFeature;
+import androidx.annotation.RestrictTo;
+import androidx.webkit.internal.WebSettingsAdapter;
+import androidx.webkit.internal.WebViewFeatureInternal;
+import androidx.webkit.internal.WebViewGlueCommunicator;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import androidx.annotation.IntDef;
-import androidx.annotation.RestrictTo;
-import androidx.webkit.internal.WebSettingsAdapter;
-import androidx.webkit.internal.WebViewGlueCommunicator;
-
 /**
  * Compatibility version of {@link android.webkit.WebSettings}
  */
 public class WebSettingsCompat {
     private WebSettingsCompat() {}
 
-    // TODO(gsennton): add feature detection
-
     /**
      * Sets whether this WebView should raster tiles when it is
      * offscreen but attached to a window. Turning this on can avoid
@@ -50,11 +50,18 @@
      *   visible WebViews and WebViews about to be animated to visible.
      * </ul>
      */
+    @SuppressLint("NewApi")
+    @RequiresFeature(name = WebViewFeature.OFF_SCREEN_PRERASTER,
+            enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
     public static void setOffscreenPreRaster(WebSettings webSettings, boolean enabled) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+        WebViewFeatureInternal webviewFeature =
+                WebViewFeatureInternal.getFeature(WebViewFeature.OFF_SCREEN_PRERASTER);
+        if (webviewFeature.isSupportedByFramework()) {
             webSettings.setOffscreenPreRaster(enabled);
-        } else {
+        } else if (webviewFeature.isSupportedByWebView()) {
             getAdapter(webSettings).setOffscreenPreRaster(enabled);
+        } else {
+            throw WebViewFeatureInternal.getUnsupportedOperationException();
         }
     }
 
@@ -64,11 +71,18 @@
      * @return {@code true} if this WebView will raster tiles when it is
      * offscreen but attached to a window.
      */
+    @SuppressLint("NewApi")
+    @RequiresFeature(name = WebViewFeature.OFF_SCREEN_PRERASTER,
+            enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
     public static boolean getOffscreenPreRaster(WebSettings webSettings) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+        WebViewFeatureInternal webviewFeature =
+                WebViewFeatureInternal.getFeature(WebViewFeature.OFF_SCREEN_PRERASTER);
+        if (webviewFeature.isSupportedByFramework()) {
             return webSettings.getOffscreenPreRaster();
-        } else {
+        } else if (webviewFeature.isSupportedByWebView()) {
             return getAdapter(webSettings).getOffscreenPreRaster();
+        } else {
+            throw WebViewFeatureInternal.getUnsupportedOperationException();
         }
     }
 
@@ -86,11 +100,18 @@
      *
      * @param enabled Whether Safe Browsing is enabled.
      */
+    @SuppressLint("NewApi")
+    @RequiresFeature(name = WebViewFeature.SAFE_BROWSING_ENABLE,
+            enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
     public static void setSafeBrowsingEnabled(WebSettings webSettings, boolean enabled) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        WebViewFeatureInternal webviewFeature =
+                WebViewFeatureInternal.getFeature(WebViewFeature.SAFE_BROWSING_ENABLE);
+        if (webviewFeature.isSupportedByFramework()) {
             webSettings.setSafeBrowsingEnabled(enabled);
-        } else {
+        } else if (webviewFeature.isSupportedByWebView()) {
             getAdapter(webSettings).setSafeBrowsingEnabled(enabled);
+        } else {
+            throw WebViewFeatureInternal.getUnsupportedOperationException();
         }
     }
 
@@ -100,11 +121,18 @@
      *
      * @return {@code true} if Safe Browsing is enabled and {@code false} otherwise.
      */
+    @SuppressLint("NewApi")
+    @RequiresFeature(name = WebViewFeature.SAFE_BROWSING_ENABLE,
+            enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
     public static boolean getSafeBrowsingEnabled(WebSettings webSettings) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        WebViewFeatureInternal webviewFeature =
+                WebViewFeatureInternal.getFeature(WebViewFeature.SAFE_BROWSING_ENABLE);
+        if (webviewFeature.isSupportedByFramework()) {
             return webSettings.getSafeBrowsingEnabled();
-        } else {
+        } else if (webviewFeature.isSupportedByWebView()) {
             return getAdapter(webSettings).getSafeBrowsingEnabled();
+        } else {
+            throw WebViewFeatureInternal.getUnsupportedOperationException();
         }
     }
 
@@ -126,12 +154,19 @@
      * Disables the action mode menu items according to {@code menuItems} flag.
      * @param menuItems an integer field flag for the menu items to be disabled.
      */
+    @SuppressLint("NewApi")
+    @RequiresFeature(name = WebViewFeature.DISABLED_ACTION_MODE_MENU_ITEMS,
+            enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
     public static void setDisabledActionModeMenuItems(WebSettings webSettings,
             @MenuItemFlags int menuItems) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+        WebViewFeatureInternal webviewFeature =
+                WebViewFeatureInternal.getFeature(WebViewFeature.DISABLED_ACTION_MODE_MENU_ITEMS);
+        if (webviewFeature.isSupportedByFramework()) {
             webSettings.setDisabledActionModeMenuItems(menuItems);
-        } else {
+        } else if (webviewFeature.isSupportedByWebView()) {
             getAdapter(webSettings).setDisabledActionModeMenuItems(menuItems);
+        } else {
+            throw WebViewFeatureInternal.getUnsupportedOperationException();
         }
     }
 
@@ -141,11 +176,18 @@
      *
      * @return all the disabled menu item flags combined with bitwise OR.
      */
+    @SuppressLint("NewApi")
+    @RequiresFeature(name = WebViewFeature.DISABLED_ACTION_MODE_MENU_ITEMS,
+            enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
     public static @MenuItemFlags int getDisabledActionModeMenuItems(WebSettings webSettings) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+        WebViewFeatureInternal webviewFeature =
+                WebViewFeatureInternal.getFeature(WebViewFeature.DISABLED_ACTION_MODE_MENU_ITEMS);
+        if (webviewFeature.isSupportedByFramework()) {
             return webSettings.getDisabledActionModeMenuItems();
-        } else {
+        } else if (webviewFeature.isSupportedByWebView()) {
             return getAdapter(webSettings).getDisabledActionModeMenuItems();
+        } else {
+            throw WebViewFeatureInternal.getUnsupportedOperationException();
         }
     }
 
diff --git a/webkit/src/main/java/androidx/webkit/WebViewCompat.java b/webkit/src/main/java/androidx/webkit/WebViewCompat.java
index 7cb0bfd..273a79d 100644
--- a/webkit/src/main/java/androidx/webkit/WebViewCompat.java
+++ b/webkit/src/main/java/androidx/webkit/WebViewCompat.java
@@ -16,6 +16,7 @@
 
 package androidx.webkit;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
@@ -135,7 +136,7 @@
             checkThread(webview);
             getProvider(webview).insertVisualStateCallback(requestId, callback);
         } else {
-            WebViewFeatureInternal.throwUnsupportedOperationException("postVisualStateCallback");
+            throw WebViewFeatureInternal.getUnsupportedOperationException();
         }
     }
 
@@ -157,12 +158,19 @@
      * @param callback will be called on the UI thread with {@code true} if initialization is
      * successful, {@code false} otherwise.
      */
+    @SuppressLint("NewApi")
+    @RequiresFeature(name = WebViewFeature.START_SAFE_BROWSING,
+            enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
     public static void startSafeBrowsing(@NonNull Context context,
             @Nullable ValueCallback<Boolean> callback) {
-        if (Build.VERSION.SDK_INT >= 27) {
+        WebViewFeatureInternal webviewFeature =
+                WebViewFeatureInternal.getFeature(WebViewFeature.START_SAFE_BROWSING);
+        if (webviewFeature.isSupportedByFramework()) {
             WebView.startSafeBrowsing(context, callback);
-        } else { // TODO(gsennton): guard with WebViewApk.hasFeature(SafeBrowsing)
+        } else if (webviewFeature.isSupportedByWebView()) {
             getFactory().getStatics().initSafeBrowsing(context, callback);
+        } else {
+            throw WebViewFeatureInternal.getUnsupportedOperationException();
         }
     }
 
@@ -189,12 +197,19 @@
      * whitelist. It will be called with {@code false} if any hosts are malformed. The callback
      * will be run on the UI thread
      */
+    @SuppressLint("NewApi")
+    @RequiresFeature(name = WebViewFeature.SAFE_BROWSING_WHITELIST,
+            enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
     public static void setSafeBrowsingWhitelist(@NonNull List<String> hosts,
             @Nullable ValueCallback<Boolean> callback) {
-        if (Build.VERSION.SDK_INT >= 27) {
+        WebViewFeatureInternal webviewFeature =
+                WebViewFeatureInternal.getFeature(WebViewFeature.SAFE_BROWSING_WHITELIST);
+        if (webviewFeature.isSupportedByFramework()) {
             WebView.setSafeBrowsingWhitelist(hosts, callback);
-        } else { // TODO(gsennton): guard with WebViewApk.hasFeature(SafeBrowsing)
+        } else if (webviewFeature.isSupportedByWebView()) {
             getFactory().getStatics().setSafeBrowsingWhitelist(hosts, callback);
+        } else {
+            throw WebViewFeatureInternal.getUnsupportedOperationException();
         }
     }
 
@@ -203,12 +218,19 @@
      *
      * @return the url pointing to a privacy policy document which can be displayed to users.
      */
+    @SuppressLint("NewApi")
     @NonNull
+    @RequiresFeature(name = WebViewFeature.SAFE_BROWSING_PRIVACY_POLICY_URL,
+            enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
     public static Uri getSafeBrowsingPrivacyPolicyUrl() {
-        if (Build.VERSION.SDK_INT >= 27) {
+        WebViewFeatureInternal webviewFeature =
+                WebViewFeatureInternal.getFeature(WebViewFeature.SAFE_BROWSING_PRIVACY_POLICY_URL);
+        if (webviewFeature.isSupportedByFramework()) {
             return WebView.getSafeBrowsingPrivacyPolicyUrl();
-        } else { // TODO(gsennton): guard with WebViewApk.hasFeature(SafeBrowsing)
+        } else if (webviewFeature.isSupportedByWebView()) {
             return getFactory().getStatics().getSafeBrowsingPrivacyPolicyUrl();
+        } else {
+            throw WebViewFeatureInternal.getUnsupportedOperationException();
         }
     }
 
diff --git a/webkit/src/main/java/androidx/webkit/WebViewFeature.java b/webkit/src/main/java/androidx/webkit/WebViewFeature.java
index d514477..eb54eed 100644
--- a/webkit/src/main/java/androidx/webkit/WebViewFeature.java
+++ b/webkit/src/main/java/androidx/webkit/WebViewFeature.java
@@ -16,6 +16,10 @@
 
 package androidx.webkit;
 
+import android.content.Context;
+import android.webkit.ValueCallback;
+import android.webkit.WebSettings;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.RestrictTo;
 import androidx.annotation.StringDef;
@@ -27,6 +31,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.util.List;
 
 /**
  * Utility class for checking which WebView Support Library features are supported on the device.
@@ -41,6 +46,18 @@
     @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
     @StringDef(value = {
             VISUAL_STATE_CALLBACK,
+            OFF_SCREEN_PRERASTER,
+            SAFE_BROWSING_ENABLE,
+            DISABLED_ACTION_MODE_MENU_ITEMS,
+            START_SAFE_BROWSING,
+            SAFE_BROWSING_WHITELIST,
+            SAFE_BROWSING_PRIVACY_POLICY_URL,
+            SERVICE_WORKER_BASIC_USAGE,
+            SERVICE_WORKER_CACHE_MODE,
+            SERVICE_WORKER_CONTENT_ACCESS,
+            SERVICE_WORKER_FILE_ACCESS,
+            SERVICE_WORKER_BLOCK_NETWORK_LOADS
+
     })
     @Retention(RetentionPolicy.SOURCE)
     @Target({ElementType.PARAMETER, ElementType.METHOD})
@@ -55,6 +72,95 @@
     public static final String VISUAL_STATE_CALLBACK = Features.VISUAL_STATE_CALLBACK;
 
     /**
+     * Feature for {@link #isFeatureSupported(String)}.
+     * This feature covers
+     * {@link androidx.webkit.WebSettingsCompat#getOffscreenPreRaster(WebSettings)}, and
+     * {@link androidx.webkit.WebSettingsCompat#setOffscreenPreRaster(WebSettings, boolean)}.
+     */
+    public static final String OFF_SCREEN_PRERASTER = Features.OFF_SCREEN_PRERASTER;
+
+    /**
+     * Feature for {@link #isFeatureSupported(String)}.
+     * This feature covers
+     * {@link androidx.webkit.WebSettingsCompat#getSafeBrowsingEnabled(WebSettings)}, and
+     * {@link androidx.webkit.WebSettingsCompat#setSafeBrowsingEnabled(WebSettings, boolean)}.
+     */
+    public static final String SAFE_BROWSING_ENABLE = Features.SAFE_BROWSING_ENABLE;
+
+    /**
+     * Feature for {@link #isFeatureSupported(String)}.
+     * This feature covers
+     * {@link androidx.webkit.WebSettingsCompat#getDisabledActionModeMenuItems(WebSettings)}, and
+     * {@link androidx.webkit.WebSettingsCompat#setDisabledActionModeMenuItems(WebSettings, int)}.
+     */
+    public static final String DISABLED_ACTION_MODE_MENU_ITEMS =
+            Features.DISABLED_ACTION_MODE_MENU_ITEMS;
+
+    /**
+     * Feature for {@link #isFeatureSupported(String)}.
+     * This feature covers
+     * {@link androidx.webkit.WebViewCompat#startSafeBrowsing(Context, ValueCallback)}.
+     */
+    public static final String START_SAFE_BROWSING = Features.START_SAFE_BROWSING;
+
+    /**
+     * Feature for {@link #isFeatureSupported(String)}.
+     * This feature covers
+     * {@link androidx.webkit.WebViewCompat#setSafeBrowsingWhitelist(List, ValueCallback)}.
+     */
+    public static final String SAFE_BROWSING_WHITELIST = Features.SAFE_BROWSING_WHITELIST;
+
+    /**
+     * Feature for {@link #isFeatureSupported(String)}.
+     * This feature covers
+     * {@link WebViewCompat#getSafeBrowsingPrivacyPolicyUrl()}.
+     */
+    public static final String SAFE_BROWSING_PRIVACY_POLICY_URL =
+            Features.SAFE_BROWSING_PRIVACY_POLICY_URL;
+
+    /**
+     * Feature for {@link #isFeatureSupported(String)}.
+     * This feature covers
+     * {@link ServiceWorkerControllerCompat#getInstance()}.
+     */
+    public static final String SERVICE_WORKER_BASIC_USAGE = Features.SERVICE_WORKER_BASIC_USAGE;
+
+    /**
+     * Feature for {@link #isFeatureSupported(String)}.
+     * This feature covers
+     * {@link ServiceWorkerWebSettingsCompat#getCacheMode()}, and
+     * {@link ServiceWorkerWebSettingsCompat#setCacheMode(int)}.
+     */
+    public static final String SERVICE_WORKER_CACHE_MODE = Features.SERVICE_WORKER_CACHE_MODE;
+
+    /**
+     * Feature for {@link #isFeatureSupported(String)}.
+     * This feature covers
+     * {@link ServiceWorkerWebSettingsCompat#getAllowContentAccess()}, and
+     * {@link ServiceWorkerWebSettingsCompat#setAllowContentAccess(boolean)}.
+     */
+    public static final String SERVICE_WORKER_CONTENT_ACCESS =
+            Features.SERVICE_WORKER_CONTENT_ACCESS;
+
+    /**
+     * Feature for {@link #isFeatureSupported(String)}.
+     * This feature covers
+     * {@link ServiceWorkerWebSettingsCompat#getAllowFileAccess()}, and
+     * {@link ServiceWorkerWebSettingsCompat#setAllowFileAccess(boolean)}.
+     */
+    public static final String SERVICE_WORKER_FILE_ACCESS = Features.SERVICE_WORKER_FILE_ACCESS;
+
+    /**
+     * Feature for {@link #isFeatureSupported(String)}.
+     * This feature covers
+     * {@link ServiceWorkerWebSettingsCompat#getBlockNetworkLoads()}, and
+     * {@link ServiceWorkerWebSettingsCompat#setBlockNetworkLoads(boolean)}.
+     */
+    public static final String SERVICE_WORKER_BLOCK_NETWORK_LOADS =
+            Features.SERVICE_WORKER_BLOCK_NETWORK_LOADS;
+
+
+    /**
      * Return whether a feature is supported at run-time. This depends on the Android version of the
      * device and the WebView APK on the device.
      */
diff --git a/webkit/src/main/java/androidx/webkit/internal/WebViewFeatureInternal.java b/webkit/src/main/java/androidx/webkit/internal/WebViewFeatureInternal.java
index 74f67e4..52189e9 100644
--- a/webkit/src/main/java/androidx/webkit/internal/WebViewFeatureInternal.java
+++ b/webkit/src/main/java/androidx/webkit/internal/WebViewFeatureInternal.java
@@ -16,11 +16,17 @@
 
 package androidx.webkit.internal;
 
+import android.content.Context;
 import android.os.Build;
+import android.webkit.ValueCallback;
+import android.webkit.WebSettings;
 
+import androidx.webkit.WebViewCompat;
 import androidx.webkit.WebViewFeature;
 import androidx.webkit.WebViewFeature.WebViewSupportFeature;
 
+import java.util.List;
+
 /**
  * Enum representing a WebView feature, this provides functionality for determining whether a
  * feature is supported by the current framework and/or WebView APK.
@@ -31,7 +37,84 @@
      * {@link androidx.webkit.WebViewCompat#postVisualStateCallback(android.webkit.WebView, long,
      * androidx.webkit.WebViewCompat.VisualStateCallback)}.
      */
-    VISUAL_STATE_CALLBACK_FEATURE(WebViewFeature.VISUAL_STATE_CALLBACK, Build.VERSION_CODES.M);
+    VISUAL_STATE_CALLBACK_FEATURE(WebViewFeature.VISUAL_STATE_CALLBACK, Build.VERSION_CODES.M),
+
+    /**
+     * This feature covers
+     * {@link androidx.webkit.WebSettingsCompat#getOffscreenPreRaster(WebSettings)}, and
+     * {@link androidx.webkit.WebSettingsCompat#setOffscreenPreRaster(WebSettings, boolean)}.
+     */
+    OFF_SCREEN_PRERASTER(WebViewFeature.OFF_SCREEN_PRERASTER, Build.VERSION_CODES.M),
+
+    /**
+     * This feature covers
+     * {@link androidx.webkit.WebSettingsCompat#getSafeBrowsingEnabled(WebSettings)}, and
+     * {@link androidx.webkit.WebSettingsCompat#setSafeBrowsingEnabled(WebSettings, boolean)}.
+     */
+    SAFE_BROWSING_ENABLE(WebViewFeature.SAFE_BROWSING_ENABLE, Build.VERSION_CODES.O),
+
+    /**
+     * This feature covers
+     * {@link androidx.webkit.WebSettingsCompat#getDisabledActionModeMenuItems(WebSettings)}, and
+     * {@link androidx.webkit.WebSettingsCompat#setDisabledActionModeMenuItems(WebSettings, int)}.
+     */
+    DISABLED_ACTION_MODE_MENU_ITEMS(WebViewFeature.DISABLED_ACTION_MODE_MENU_ITEMS,
+                                    Build.VERSION_CODES.N),
+
+    /**
+     * This feature covers
+     * {@link androidx.webkit.WebViewCompat#startSafeBrowsing(Context, ValueCallback)}.
+     */
+    START_SAFE_BROWSING(WebViewFeature.START_SAFE_BROWSING, Build.VERSION_CODES.O_MR1),
+
+    /**
+     * This feature covers
+     * {@link androidx.webkit.WebViewCompat#setSafeBrowsingWhitelist(List, ValueCallback)}.
+     */
+    SAFE_BROWSING_WHITELIST(WebViewFeature.SAFE_BROWSING_WHITELIST, Build.VERSION_CODES.O_MR1),
+
+    /**
+     * This feature covers
+     * {@link WebViewCompat#getSafeBrowsingPrivacyPolicyUrl()}.
+     */
+    SAFE_BROWSING_PRIVACY_POLICY_URL(WebViewFeature.SAFE_BROWSING_PRIVACY_POLICY_URL,
+            Build.VERSION_CODES.O_MR1),
+
+    /**
+     * This feature covers
+     * {@link androidx.webkit.ServiceWorkerControllerCompat#getInstance()}.
+     */
+    SERVICE_WORKER_BASIC_USAGE(WebViewFeature.SERVICE_WORKER_BASIC_USAGE, Build.VERSION_CODES.N),
+
+    /**
+     * This feature covers
+     * {@link androidx.webkit.ServiceWorkerWebSettingsCompat#getCacheMode()}, and
+     * {@link androidx.webkit.ServiceWorkerWebSettingsCompat#setCacheMode(int)}.
+     */
+    SERVICE_WORKER_CACHE_MODE(WebViewFeature.SERVICE_WORKER_CACHE_MODE, Build.VERSION_CODES.N),
+
+    /**
+     * This feature covers
+     * {@link androidx.webkit.ServiceWorkerWebSettingsCompat#getAllowContentAccess()}, and
+     * {@link androidx.webkit.ServiceWorkerWebSettingsCompat#setAllowContentAccess(boolean)}.
+     */
+    SERVICE_WORKER_CONTENT_ACCESS(WebViewFeature.SERVICE_WORKER_CONTENT_ACCESS,
+            Build.VERSION_CODES.N),
+
+    /**
+     * This feature covers
+     * {@link androidx.webkit.ServiceWorkerWebSettingsCompat#getAllowFileAccess()}, and
+     * {@link androidx.webkit.ServiceWorkerWebSettingsCompat#setAllowFileAccess(boolean)}.
+     */
+    SERVICE_WORKER_FILE_ACCESS(WebViewFeature.SERVICE_WORKER_FILE_ACCESS, Build.VERSION_CODES.N),
+
+    /**
+     * This feature covers
+     * {@link androidx.webkit.ServiceWorkerWebSettingsCompat#getBlockNetworkLoads()}, and
+     * {@link androidx.webkit.ServiceWorkerWebSettingsCompat#setBlockNetworkLoads(boolean)}.
+     */
+    SERVICE_WORKER_BLOCK_NETWORK_LOADS(WebViewFeature.SERVICE_WORKER_BLOCK_NETWORK_LOADS,
+            Build.VERSION_CODES.N);
 
     private final String mFeatureValue;
     private final int mOsVersion;
@@ -45,12 +128,10 @@
      * Return the {@link WebViewFeatureInternal} corresponding to {@param feature}.
      */
     public static WebViewFeatureInternal getFeature(@WebViewSupportFeature String feature) {
-        switch (feature) {
-            case WebViewFeature.VISUAL_STATE_CALLBACK:
-                return VISUAL_STATE_CALLBACK_FEATURE;
-            default:
-                throw new RuntimeException("Unknown feature " + feature);
+        for (WebViewFeatureInternal internalFeature : WebViewFeatureInternal.values()) {
+            if (internalFeature.mFeatureValue.equals(feature)) return internalFeature;
         }
+        throw new RuntimeException("Unknown feature " + feature);
     }
 
     /**
@@ -86,8 +167,8 @@
      * Utility method for throwing an exception explaining that the feature the app trying to use
      * isn't supported.
      */
-    public static void throwUnsupportedOperationException(String feature) {
-        throw new UnsupportedOperationException("Feature " + feature
-                + " is not supported by the current version of the framework and WebView APK");
+    public static UnsupportedOperationException getUnsupportedOperationException() {
+        return new UnsupportedOperationException("This method is not supported by the current "
+                + "version of the framework and the current WebView APK");
     }
 }