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