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

[automerger skipped] Merge "resolve merge conflicts of b6347c9d to sc-v2-dev-plus-aosp" into sc-v2-dev-plus-aosp am: 72784deb -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/+/15360680

Change-Id: I6b3ed00829f54146e65d2dc34ed2227720caf62c