Merging from ub-launcher3-rvc-dev @ build 6557059 am: fa6e021ce6

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

Change-Id: Ic448486b5a346596a3bdd0b246667e2666c202b0