Merge "Merging from ub-launcher3-master @ build 6552470 am: 1598484f am:...

Merge "Merging from ub-launcher3-master @ build 6552470 am: 1598484f am: 1e82844c" into rvc-qpr-dev-plus-aosp am: e02d1acc

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

Change-Id: I424da0b3c85690cd9ec1c8a320daeea697c581ad