[automerger skipped] Merge "resolve merge conflicts of...

[automerger skipped] Merge "resolve merge conflicts of 46378eb8 to sc-v2-dev" into sc-v2-dev am: f3a387d7 am: 2482a194 -s ours

am skip reason: Merged-In Id49bae33438e10248bef05450d7e2c92c2140748 with SHA-1 2cc564c6 is already in history

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

Change-Id: I30f71ea6775d44742c5e0ac1f286129a30f4bf38