[automerger skipped] Merge "Merge Android 12 QPR 3" am: 250f92bb -s ours am: 3ccbee45 -s ours

am skip reason: Merged-In I540ce3429cb4b1b86b8554a08677679c932b05e5 with SHA-1 bf8a2429 is already in history

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



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