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

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

Change-Id: I7f74c8105ff1ff567b9748d9f4deea00113ecde5