[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-7ba50c92d19c455d8266daf2c96ec31b" into sc-v2-dev-plus-aosp am: 1d3b256e -s ours

am skip reason: Merged-In Ie0c6140e14186e41c7e4748dc745f87349b084fe with SHA-1 5fa2ed27 is already in history

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

Change-Id: Ia44618aaff3298907abc19c5f99a93680f3826a0