tree c06bbb1f3734b1c0c5dfc59585902e2390940535
parent 19ce4e25868bec5fe4436d037c0882a18747afe9
parent 7a24bea23dcc2c2bacc5898b0244014ad27c1056
author Xin Li <delphij@google.com> 1639518659 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1639518659 +0000

[automerger skipped] Merge "Merge Android 12 QPR1" am: 3afd8cbc24 -s ours am: 18c3599e0e -s ours am: 7a24bea23d -s ours

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

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

Change-Id: Ie18ce05962c674f5158993d67e9f9334234cfd3f