[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: 33098501 am: 3b5064c6 am: ca73131b -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: Id2e8d0cef83353c0896d86757fcc855f196b7602