[automerger skipped] Merging ub-launcher3-rvc-qpr-dev to rvc-qpr-dev am: 45c0918f47 am: 7787848788 -s ours

am skip reason: Change-Id Ibff46b3ef7ff89accb459db323f31179adb4ef21 with SHA-1 928a421b99 is in history

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

Change-Id: Ie30c674405d296a3783e801936536cfb17b68865