Merging from ub-launcher3-rvc-qpr-dev @ build 6690853 am: 4955f5d497

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

Change-Id: I1cc6838b03759eb090e63ae880a297350321d6e6