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

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

Change-Id: Ie21ecdcaae113643a8c59b28c52d2792912ad76a