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

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

Change-Id: I74706e587b0a269c8977587ed29488bdddd65a46