Merge "Merging from ub-launcher3-rvc-dev @ build 6621659" into rvc-dev am: 738b1af3 am: 569793bd

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

Change-Id: Iaa2a6de691298983d09642cc8db9f084efdea0ca