tree 478e015403ed361f821f892886008c9d8718f1ee
parent db37d96b8399ea1f19b339c4ce40e3cbbffe7b0c
parent 9b17656ba199f530fef4385e5f2017d954956d17
author Colin Cross <ccross@android.com> 1631225914 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1631225914 +0000

Merge changes from topic "androidx_drop-sc-dev-plus-aosp" into sc-dev-plus-aosp am: af52aea9a3 am: 9b17656ba1

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15689632

Change-Id: I52e46ed8fcc9a47ad97da077ada959a719055ba4