Merge "Merging from ub-launcher3-rvc-dev @ build 6617269" into rvc-dev am: a271085506 am: 3309850150

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

Change-Id: Ia45c84e7afe144515eee4dc66b6339e0d8e46f96