[automerger skipped] Merge Android 12L am: bac85d03 -s ours am: 5f2987a8...

[automerger skipped] Merge Android 12L am: bac85d03 -s ours am: 5f2987a8 -s ours am: bf72e8be -s ours am: e465497b -s ours

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

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

Change-Id: I397b776a395821d9fda851230b020563086566c2