[automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: 42a11f83 -s...

[automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: 42a11f83 -s ours am: c86ee867 -s ours

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

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



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