Merge "Merging from ub-launcher3-rvc-dev @ build 6621659" into rvc-dev am: 738b1af342 am: f7897465e3 am: 808a7c1920 am: dde7797ec5

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

Change-Id: Ifdd13981f0e61d248e89a1f10eec3b51369840f4