Merge "Merging from ub-launcher3-master @ build 6552470 am: 1598484f96 am: 1e82844c8c" into rvc-qpr-dev-plus-aosp am: e02d1acce2

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

Change-Id: I424da0b3c85690cd9ec1c8a320daeea697c581ad