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

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

Change-Id: I8a10d9cda659a374d6e6edc5296416bbb83064cf