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

[automerger skipped] Merge ab/6749736 in stage. am: 2ef7e399 -s ours am: f6b4389d -s ours am: 5767441c -s ours

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

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

Change-Id: I0ea6e626d9c3ac31e9ff6a93ce05929dca203571