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

[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: b252da0e -s ours am: 40df1d25 -s ours am: 5fc990a2 -s ours

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

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

Change-Id: I0c967217571a01b5284a36c1c7cfca9cd414b7c8