[automerger skipped] Merge "Merge SP1A.211105.004 to aosp-master - DO NOT...

[automerger skipped] Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE" am: 6fcd0f86 -s ours

am skip reason: Merged-In Id6156b3469ffc23b171415d792cf48c9db9634c2 with SHA-1 526386b2 is already in history

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

Change-Id: I0326842ee7088786e0b5b267f7a9fe199f42a18b