Merging from ub-launcher3-rvc-dev @ build 6577335 am: 8020bf2f4b am: e0a0876062 am: 3e6a5661ac

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

Change-Id: I5816d486d62d6af731b37482cb42eb826a09d591