Merge "Merging from ub-launcher3-rvc-dev @ build 6617269" into rvc-dev am: a271085506

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

Change-Id: I1cb4a775fda0f70b0839398ac0f4b8e224c7880c