[automerger skipped] Merge "Merge Android 12L" am: 3a9bb04f -s ours am:...

[automerger skipped] Merge "Merge Android 12L" am: 3a9bb04f -s ours am: f29e0a22 -s ours am: 9551cc3f -s ours

am skip reason: Merged-In Icf0cc432ab3a97614b27efcf6fc9d18ea423a743 with SHA-1 11a04548 is already in history

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

Change-Id: I9c74d7ae6c2a70d2fa95c4372a33c5b5441b5e0c