[automerger skipped] Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: 42b2895370 -s ours am: 3026557289 -s ours

am skip reason: Merged-In I310e7924c7767b24b697fc96a098b37db4cf1216 with SHA-1 b891ee715f is already in history

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

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