[automerger skipped] Merging from ub-launcher3-master @ build 6639132 am:...

[automerger skipped] Merging from ub-launcher3-master @ build 6639132 am: 1eb599ca am: d75afe7c am: 6064a05e -s ours

am skip reason: Change-Id I45c9d6441ddd1c32efaba73770f458f722a81bac with SHA-1 899b362e is in history

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

Change-Id: Ib97e3bd975166291f31d5c438c6468bab9840ff9