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

am skip reason: subject contains skip directive

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

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