Merging from ub-launcher3-rvc-qpr-dev @ build 6809704 am: 01a51f5bb9

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

Change-Id: I12011e519f314484b875d5f05fcf49b60af59a34