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

[automerger skipped] Merge "Merge "Merging from ub-launcher3-rvc-dev @ build 6617269" into rvc-dev am: a2710855 am: 33098501 am: 633f0ca0" into rvc-qpr-dev-plus-aosp am: e61a6643 -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: I811e9e157a65c1bb49e2570e853f6b3e5fd126db