Merging from ub-launcher3-rvc-qpr-dev @ build 6777894 am: 2a935cb8aa

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

Change-Id: Id4f7081ade92a8e1e90ffc8064a2e46dc644f569