Merging from ub-launcher3-rvc-qpr-dev @ build 6827161 am: a30f03667f

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

Change-Id: Icd6d2955017e795346ae073f69b073f4dadfc192