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

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

Change-Id: I282963bc51f8d4882b526baa0d6c6b846e1cbb9a