[automerger skipped] Merging from ub-launcher3-rvc-qpr-dev @ build 6690853 am:...

[automerger skipped] Merging from ub-launcher3-rvc-qpr-dev @ build 6690853 am: 4955f5d4 am: fc0fb331 -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/+/12190423

Change-Id: I901ea3b9babb8904df52f362f5943416b0cfead5