[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: fb65043b -s ours am: 3055b9c8 -s ours am: d157b467 -s ours am: dead62bf -s ours

am skip reason: subject contains skip directive

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

Change-Id: I89d69409897c38c6a4cb63b5fd9745eb674d4a34