[automerger skipped] Merge Android 13 QPR2 am: b0d15db0 -s ours

am skip reason: Merged-In I58b416c43fda20b9b028106e6bb4e451addbbbaa with SHA-1 96fbc571 is already in history

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



Change-Id: Iba7369a8c75fdd2d06839981012c6dfd1861f7a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>