[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: 657d475163 -s ours

am skip reason: Merged-In I3e6ba1d8645335785e8e26cdc895ea9c0017a0fd with SHA-1 8786016e85 is already in history

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

Change-Id: I6b24cb86ec0c290d24c6aaf91c2a18875fd513ba