[automerger skipped] DO NOT MERGE am: 1fb6718c85 am: 370e783674 -s ours am: 5af733122b -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4775d59c8e5b3424a1d93623dc71d44a9dfb3562