Merging from ub-launcher3-master @ build 6552470 am: 1598484f96 am: 1e82844c8c

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

Change-Id: Ia93b34f4fd3d39cd4be1f471cc19d11f4a4731ef