[automerger skipped] Merging from ub-launcher3-rvc-qpr-dev @ build 6770831 am: 94a8525e93 am: 95a8129fd2 -s ours

am skip reason: Change-Id I7f90d00ecb2ed81c8d4921007b249a58ecf055b0 with SHA-1 29f2a33712 is in history

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

Change-Id: Ia6c3421e46e1e3322ae9e68d2dbd7419280583e4