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

am skip reason: subject contains skip directive

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

Change-Id: I79f9a308bedeb84bdb80788a19e172de503d03a3