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

am skip reason: subject contains skip directive

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

Change-Id: I531ce243f02b80ed7ae5eb8956255e93858311d1