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: If35ada1fbc68fcd2fb968b1c2460e28d4e1cac8c