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

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

Change-Id: I33ae3bc11d35436c5d925c593093d3bbfde00828