[automerger skipped] Merge "Merge Android 12" am: e84b3a6c3b -s ours am: aab33ff88b -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: I4e15ec3e294633fbf852fdecf1cb974cf4f579f6