[automerger skipped] Merge UP1A.230905.019 am: 841dfad3d6 -s ours am: 520168d7e8 -s ours am: 5397198074 -s ours

am skip reason: Merged-In Ic437ff4d19cbd5764635f3007d99880622150f5b with SHA-1 2e53f5ef97 is already in history

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

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