[automerger skipped] Merge "resolve merge conflicts of 32a0ea311513a9bc11e8bb30e4fc13d00b9bcd5b to sc-v2-dev-plus-aosp" into sc-v2-dev-plus-aosp am: 31109a44cf -s ours

am skip reason: Merged-In Ia904b8b96301042c900e0589f33fc625c1c1148b with SHA-1 0750f03c96 is already in history

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

Change-Id: I9b52b8df9141ffc13a951401207dbfabe2ddc8e0