[automerger skipped] Merge ab/6749736 in stage. am: 2ef7e39983 -s ours

am skip reason: Change-Id Id9c756552c08d7690b99987dafadc13448a0c236 with SHA-1 0581f5b05b is in history

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

Change-Id: I5c166c4b778272882283ec85d5945912abf52f7a