Merging from ub-launcher3-rvc-dev @ build 6595814 am: efdc4e23 am:...

Merging from ub-launcher3-rvc-dev @ build 6595814 am: efdc4e23 am: 55c807d6 am: c113351e am: 824274ae

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

Change-Id: Iaf241d650be0e4f68171b5af5e67e552cc2258b1