[automerger skipped] [DO NOT MERGE] am: d0823a77da am: ba862b40b4 -s ours

am skip reason: Merged-In Ie476f8cbe56bf51218b15b8361a22fec2dc845e6 with SHA-1 1c01685186 is already in history

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

Change-Id: If9e0f924dc32731cee5b3b7980770f3addecd550