[automerger skipped] Merge "Revert "Merging from ub-launcher3-rvc-qpr-dev @...

[automerger skipped] Merge "Revert "Merging from ub-launcher3-rvc-qpr-dev @ build 6690853"" into rvc-qpr-dev am: eeb497cf am: 220e1891 -s ours

am skip reason: Change-Id Ibff46b3ef7ff89accb459db323f31179adb4ef21 with SHA-1 928a421b is in history

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

Change-Id: I8e3ff535a24f08e769f592e1750e7054921f85c2