[automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 7c68785b02 -s ours am: b613e0f43d -s ours

am skip reason: Merged-In Ic3e8c89ef9571af2b88516911f0fe1238a2eb847 with SHA-1 e24db03da4 is already in history

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

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