[automerger skipped] Merge ab/7061308 into stage. am: d7927e46dc -s ours am: 6b965bbd7f -s ours am: aec90be631 -s ours

am skip reason: Change-Id Ib590035a7b3f124b2a767279623d51bc8c0dbd18 with SHA-1 dc0b212582 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib42cf46920d181a79181cc6b7e4482ae884c576c