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

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

Change-Id: Id88e52d8dd32331c30b5abcc26a584d923df5f2e