Merging from ub-launcher3-rvc-qpr-dev @ build 6861538 am: a9397251d5 am: 6008ef32d0

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

Change-Id: I922fa0745a08fc8c1c86c2ec44b277939705b15e