[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: b252da0e67 -s ours

am skip reason: Merged-In Ic51ea9d199e6a072168365aeb7553203cd2c43c6 with SHA-1 4b3c24d0d3 is already in history

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

Change-Id: I48bec9307c0b9a015ae63ec906995b0549339cd1