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

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

Change-Id: I42bfe12c6c1f84d816eab2938ac9f920dfdcde37