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

[automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 7c68785b -s ours am: b613e0f4 -s ours am: 3ebae8de -s ours

am skip reason: subject contains skip directive

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



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