Merge "[3/n] Move new picker logic to AOSP" into sc-dev am: c44abebfe4

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

Change-Id: Ifce4fc750dca80c80c8bbfa6a7aac8d4961686f1