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

[automerger skipped] Merging from ub-launcher3-rvc-qpr-dev @ build 6777894 am: 45f8faa5 am: 6b65743a -s ours

am skip reason: Change-Id I41c922eedb613f733ff34c0b6f0cf5f4af48c9c0 with SHA-1 c702800a is in history

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

Change-Id: Ia04a3d70df4af60d36a2b11a8bc4f40ccddf4cfa