Merging from ub-launcher3-rvc-qpr-dev @ build 6777894 am: 45f8faa546

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

Change-Id: Icf39216253fb1c992552e29d1fd3f3671665e79d