Merging from ub-launcher3-master @ build 6632592 am: a2cee8c9e6 am: dd654b667f

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

Change-Id: Ie70aec40b73df4b19126b15d174ed4ef85700b20