Merge "Revert "Merging from ub-launcher3-rvc-qpr-dev @ build 6690853"" into rvc-qpr-dev am: eeb497cf92

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

Change-Id: I0fcc51ede759c11c383b5c46d79c60a63438175c