Merging from ub-launcher3-rvc-dev @ build 6595814 am: efdc4e2318 am: 9cb1795a71 am: bde64bc798 am: face4f22ad

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

Change-Id: I87859053144d1b4763f77468ba47eaaa45f75877