Merging from ub-launcher3-master @ build 6586492 am: 616b7223d9 am: ee71b6a679 am: 5f3356c7e6

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

Change-Id: Id8f5de84be7b911c47d6ffee3ea824eaea55c105