Merging from ub-launcher3-rvc-dev @ build 6557059 am: fa6e021ce6 am: 72ac4fa778

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

Change-Id: I84b530da9ddc66cb0b28440a91a15cc9ab9ea682