Merging from ub-launcher3-rvc-dev @ build 6595814 am: efdc4e2318 am: 9cb1795a71 am: ad4bd43b8f am: 9269333de9

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

Change-Id: Ie7d2e841b2d41504e07633f116d80b4e3adde59f