Merge "[4/4] Move new picker logic to AOSP" into sc-dev am: 1187d676d0

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

Change-Id: I692d3d70bd4b6b2f121f0d7a765af6649c7edc8e