Merging from ub-launcher3-rvc-dev @ build 6577335 am: 8020bf2f4b am: e0a0876062

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

Change-Id: I043d4e24a4e3de3eda166657023c6103de368dbb