[automerger skipped] Merge Android 12L am: bac85d0348 -s ours am: 5f2987a89b -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: I2881c5cf413f745e6817f4dde07ec4c04ff033c7