[automerger skipped] Merge "DO NOT MERGE" into sc-dev am: 77afcf32f3 -s ours am: f9a402c34c

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

Change-Id: I8d396b983e2b10cca5454db92d4dfe0f1da8faaa