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

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

Change-Id: I329d7b89b0c2c6411bec0e6eaab8094a5914bcee