tree af8ec439dffacd36f9de133f875ca068275f45c6
parent bf72e8be477058030a4088aeed1480a7f1d891af
parent f29e0a220b65d05626016eb9af4c038ee0a05677
author Xin Li <delphij@google.com> 1646737590 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646737590 +0000

[automerger skipped] Merge "Merge Android 12L" am: 3a9bb04f93 -s ours am: f29e0a220b -s ours

am skip reason: Merged-In Icf0cc432ab3a97614b27efcf6fc9d18ea423a743 with SHA-1 11a0454879 is already in history

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

Change-Id: If6d6bda6e649e84c6ff11fe8e43d12bd8b4be274