[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: 657d475163 -s ours am: 52e33abeaa -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: Ic23e85f263295cdbade6d4b3b587c74182ba5674