Merging from ub-launcher3-rvc-dev @ build 6595814 am: efdc4e2318 am: 55c807d676 am: c113351e35

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

Change-Id: I698986f5bebb17778816804cc1b23b75f550c1fe