Revert "Merging from ub-launcher3-rvc-qpr-dev @ build 6690853" am: 08aa828a57

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

Change-Id: Iabd8ab5960ca9ed6a1adb1447e22b84a6e7b1133