tree 229be78c8b5b58d860979a85852e0be5b0cd185c
parent 89d3205314e1c87adbc828008fbfd19630f527db
parent e3e389a502cc103ae0eb06034584e197332ca4c0
author Xin Li <delphij@google.com> 1633683567 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633683567 +0000

[automerger skipped] Merge "Merge Android 12" am: e84b3a6c3b -s ours am: aab33ff88b -s ours am: 0ccf3f4fd8 -s ours am: dd241611e5 -s ours am: e3e389a502 -s ours

am skip reason: Merged-In I3958bd9fb5521d09fa7cae642128b9f5e11b8e2e with SHA-1 183bca2dcc is already in history

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

Change-Id: I3b848895e6241d8f792398e44fefd2c17bec3c8a