[automerger skipped] Merge 10952656 am: 6212824683 -s ours am: e2dbb59792 -s ours

am skip reason: Merged-In I027ebf7933332b48434144f9776fb8a29c783fb6 with SHA-1 9f3945cfff is already in history

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

Change-Id: I38138b60f05634091809f65a2b4d4519a8516bef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>