Merging from ub-launcher3-rvc-qpr-dev @ build 6861538 am: 4035b79b1d am: 3f563648be

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

Change-Id: I171f7eb40ebe8057f815e36503daae0bc2a0330f