[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: 17561f2a -s ours am: 5976b981 -s ours

am skip reason: subject contains skip directive

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



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