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

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

Change-Id: I2725d65848cc3f239a41a01942c65ab65e7ec35a