[automerger skipped] Merge "Merge TQ1A.221205.012" into stage-aosp-master am: a3ad11f5 -s ours

am skip reason: Merged-In Ie9c62c0ee81086801942328c8770f37d5bf622c3 with SHA-1 0d3c3d8f is already in history

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



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