[automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT...

[automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" am: e7c175c9 -s ours

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

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



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