[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am:...

[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: bbd9e79b -s ours am: 75cf4399 -s ours

am skip reason: Merged-In Iec90538bf8dd18fede035d7f548a71b757d2356c with SHA-1 88c671ee is already in history

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

Change-Id: I2b7748f05b6ef762d4b16a7646d610caaa01f607