[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am:...

[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: ecb18a65 -s ours am: 89962500 -s ours

am skip reason: Change-Id I56abeae5adec79a1c7bdad1a261f0f62c055cf2e with SHA-1 b3ab1189 is in history

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

Change-Id: I53d2916c3602028ae40c6350424fab176db1e7f7