[automerger skipped] Merge "Merging from ub-launcher3-rvc-qpr-dev @ build...

[automerger skipped] Merge "Merging from ub-launcher3-rvc-qpr-dev @ build 6690853" into rvc-qpr-dev am: aae7f2b6 am: 36b568cb -s ours

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

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

Change-Id: I0b0cfbb7133be9b25320b07240248d3f5158e7ab