[automerger skipped] DO NOT MERGE am: 1fb6718c85 am: b4d9ebd0de -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: I23bf3739a979e0b74bd72907cf97ef8c60bc551b