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

[automerger skipped] Revert "Merging from ub-launcher3-rvc-qpr-dev @ build 6690853" am: 08aa828a am: 861a7311 -s ours

am skip reason: Change-Id I73b8d68680b23d320d4e873252002b758d99c0ae with SHA-1 d2e4d390 is in history

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

Change-Id: I37425b0d09031a9fa69f6abebbfa292a5464945f