Merging from ub-launcher3-rvc-dev @ build 6552182 am: e557bac0a1

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

Change-Id: Ifa54f1e1a91a82b4120caa9441c9c8b630b7e907