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

[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: c4a6b5cc -s ours am: 82122082 -s ours am: 43497b52 -s ours

am skip reason: Merged-In I40bef9eb41bfedf73ac4bd0ff0050833d2a9623c with SHA-1 447bd19f is already in history

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

Change-Id: I37ca89cb06a39d06ab2937a67d58d2507950d040