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

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

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

Change-Id: I37bb26275648a1835ef15bfb2b9175c60df6e504