[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "androidx_drop-stage-aosp-master" into stage-aosp-master am: 2ed25e35 -s ours

am skip reason: Merged-In I3958bd9fb5521d09fa7cae642128b9f5e11b8e2e with SHA-1 ca34b4d5 is already in history

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

Change-Id: I2e1f58c6291e8d8ae6c48b6adb7e2d3fc3b99277