[automerger skipped] Merge "Merge Android 12 QPR1" am: 3afd8cbc -s ours am:...

[automerger skipped] Merge "Merge Android 12 QPR1" am: 3afd8cbc -s ours am: 18c3599e -s ours am: 7a24bea2 -s ours

am skip reason: Merged-In Iae5e73b18d8885df51c1fca1ef27e277721a8237 with SHA-1 c4a6b5cc is already in history

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

Change-Id: Ie18ce05962c674f5158993d67e9f9334234cfd3f