[automerger skipped] Merge "Merge Android 12" am: e84b3a6c -s ours am:...

[automerger skipped] Merge "Merge Android 12" am: e84b3a6c -s ours am: aab33ff8 -s ours am: 0ccf3f4f -s ours

am skip reason: Merged-In I3958bd9fb5521d09fa7cae642128b9f5e11b8e2e with SHA-1 183bca2d is already in history

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

Change-Id: I1de8274053d21518d9cb9202b53bf945f5335a44