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

[automerger skipped] Merge "Merging from ub-launcher3-rvc-dev @ build 6617269" into rvc-dev am: a2710855 am: d9bb7674 am: 5a0ca31e am: 7f004c66 -s ours

am skip reason: Change-Id I2a168bfa8e3979ade26ab1d3cddbbae84cf79590 with SHA-1 0b51b916 is in history

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

Change-Id: I535cbb6c4c0dfc9b7ed90b0fc33bd9cc1c8da25e