Merging from ub-launcher3-master @ build 6586492 am: 616b7223d9 am: 921366922e am: bc62fd9e94

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

Change-Id: Ie0441d6a6b55405f49756e94b07cd91df73fca74