Merging from ub-launcher3-rvc-dev @ build 6577335 am: 8020bf2f am: c4146d65 am: 9dce33f8

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

Change-Id: I316055b0254817bfae3c803bb4b1c9f9e0c593b4