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

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

Change-Id: Id966d0663464d43ddb4fd199c195883ff4ccb9cb