Merging from ub-launcher3-rvc-qpr-dev @ build 6777894 am: 0486a03832

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

Change-Id: Iefbcc71d3af5867973a7fc41fe6f31dff905946f